composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-28 13:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/cmdbsource.class.inc.php
#	core/log.class.inc.php
#	test/setup/iTopDesignFormat/iTopDesignFormatTest.php
This commit is contained in:
Pierre Goiffon
2022-01-12 09:56:16 +01:00
parent c87de1024d 693a861e7d
commit b55ba2ac7f
6 changed files with 87 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/phpunit.xml.dist
View File

@@ -19,7 +19,7 @@
<phpunit bootstrap="unittestautoload.php"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
backupGlobals="false"
backupGlobals="true"
backupStaticAttributes="false"
cacheTokens="false"
colors="true"
@@ -53,6 +53,9 @@
<testsuite name="Tickets">
<directory>itop-tickets</directory>
</testsuite>
<testsuite name="Config">
<directory>itop-config</directory>
</testsuite>
<testsuite name="Application">
<directory>application</directory>
</testsuite>
@@ -66,7 +69,7 @@
<directory>synchro</directory>
</testsuite>
<testsuite name="Setup">
<file>setup/SetupUtilsTest.php</file>
<directory>setup</directory>
</testsuite>
<testsuite name="Integration">
<directory>integration</directory>