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

# Conflicts:
#	composer.json
#	core/cmdbchangeop.class.inc.php
#	core/cmdbobject.class.inc.php
#	css/light-grey.scss
#	setup/setuputils.class.inc.php
#	test/ItopTestCase.php
#	test/core/ConfigTest.php
#	test/core/LogAPITest.php
#	test/core/UserRightsTest.php
#	test/core/dictApcuTest.php
#	test/core/dictTest.php
#	test/core/iTopConfigParserTest.php
#	test/core/ormLinkSetTest.php
#	test/phpunit.xml.dist
#	test/postbuild_integration.xml.dist
#	test/setup/SetupUtilsTest.php
#	test/status/StatusIncTest.php
#	webservices/cron.php
This commit is contained in:
Pierre Goiffon
2022-04-22 15:26:18 +02:00
67 changed files with 1063 additions and 712 deletions

View File

@@ -1,68 +1,53 @@
<!-- Copyright (c) 2010-2021 Combodo SARL -->
<!-- -->
<!-- This file is part of iTop. -->
<!-- -->
<!-- iTop is free software; you can redistribute it and/or modify -->
<!-- it under the terms of the GNU Affero General Public License as published by -->
<!-- the Free Software Foundation, either version 3 of the License, or -->
<!-- (at your option) any later version. -->
<!-- -->
<!-- iTop is distributed in the hope that it will be useful, -->
<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -->
<!-- GNU Affero General Public License for more details. -->
<!-- -->
<!-- You should have received a copy of the GNU Affero General Public License -->
<!-- along with iTop. If not, see <http://www.gnu.org/licenses/> -->
<!-- -->
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
bootstrap="unittestautoload.php"
backupGlobals="true"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnRisky="false"
stopOnSkipped="false"
verbose="true"
>
<phpunit bootstrap="unittestautoload.php"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
backupGlobals="true"
backupStaticAttributes="false"
cacheTokens="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
mapTestClassNameToCoveredClassName="false"
printerClass="\PHPUnit\TextUI\ResultPrinter"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
stopOnRisky="false"
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
verbose="false">
<php>
<ini name="display_errors" value="true"/>
<ini name="error_reporting" value="true"/>
</php>
<testsuites>
<testsuite name="Extensions">
<directory>../env-production/*/test</directory>
<testsuite name="Application">
<directory>application</directory>
</testsuite>
<testsuite name="Core">
<directory>core</directory>
</testsuite>
<testsuite name="Webservices">
<directory>webservices</directory>
<testsuite name="CoreExtensions">
<directory>coreExtensions</directory>
</testsuite>
<testsuite name="Tickets">
<directory>itop-tickets</directory>
<testsuite name="Integration">
<directory>integration</directory>
</testsuite>
<testsuite name="Config">
<testsuite name="Itop-Config">
<directory>itop-config</directory>
</testsuite>
<testsuite name="Application">
<directory>application</directory>
<testsuite name="Itop-Tickets">
<directory>itop-tickets</directory>
</testsuite>
<!-- OQL : taking too long (20min+)... we should move this to nightlies ! See N°4655 -->
<!--testsuite name="OQL">
<directory>OQL</directory>
</testsuite-->
<testsuite name="Setup">
<directory>setup</directory>
</testsuite>
<testsuite name="Sources">
<directory>sources</directory>
</testsuite>
@@ -72,14 +57,12 @@
<testsuite name="Synchro">
<directory>synchro</directory>
</testsuite>
<testsuite name="Setup">
<directory>setup</directory>
<testsuite name="Webservices">
<directory>webservices</directory>
</testsuite>
<testsuite name="Integration">
<directory>integration</directory>
</testsuite>
<testsuite name="CoreExtensions">
<directory>coreExtensions</directory>
<testsuite name="Extensions">
<directory>../env-production/*/test</directory>
</testsuite>
</testsuites>