composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	test/phpunit.xml.dist
This commit is contained in:
Pierre Goiffon
2022-01-13 13:36:09 +01:00
parent ec0c98bb0f a43adcd202
commit 135ddbf37d
2 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/backup.class.inc.php
View File

@@ -469,6 +469,7 @@ EOF;
* @uses \CMDBSource::GetDBVersion() so needs a connection opened !
*
* @since 2.5.0 N°1260
* @since 2.6.2 2.7.0 N°2336 Call DB to get vendor and version (so CMDBSource must be init before calling this method)
* @link https://dev.mysql.com/doc/refman/5.6/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections"
*/
public static function GetMysqlCliTlsOptions($oConfig)

100
test/phpunit.xml.dist
View File

@@ -40,55 +40,57 @@
timeoutForLargeTests="60"
verbose="false">
<testsuites>
<testsuite name="Extensions">
<directory>../env-production/*/test</directory>
</testsuite>
<testsuite name="Core">
<directory>core</directory>
</testsuite>
<testsuite name="Webservices">
<directory>webservices</directory>
</testsuite>
<testsuite name="Tickets">
<directory>itop-tickets</directory>
</testsuite>
<testsuite name="Config">
<directory>itop-config</directory>
</testsuite>
<testsuite name="Application">
<directory>application</directory>
</testsuite>
<!--testsuite name="OQL">
<directory>OQL</directory>
</testsuite-->
<testsuite name="Sources">
<directory>sources</directory>
</testsuite>
<testsuite name="Status">
<directory>status</directory>
</testsuite>
<testsuite name="Synchro">
<directory>synchro</directory>
</testsuite>
<testsuite name="Setup">
<directory>setup</directory>
</testsuite>
<testsuite name="Integration">
<directory>integration</directory>
</testsuite>
<testsuite name="CoreExtensions">
<directory>coreExtensions</directory>
</testsuite>
</testsuites>
<testsuites>
<testsuite name="Application">
<directory>application</directory>
</testsuite>
<testsuite name="Core">
<directory>core</directory>
</testsuite>
<testsuite name="CoreExtensions">
<directory>coreExtensions</directory>
</testsuite>
<testsuite name="Integration">
<directory>integration</directory>
</testsuite>
<testsuite name="Itop-Config">
<directory>itop-config</directory>
</testsuite>
<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>
<testsuite name="Status">
<directory>status</directory>
</testsuite>
<testsuite name="Synchro">
<directory>synchro</directory>
</testsuite>
<testsuite name="Webservices">
<directory>webservices</directory>
</testsuite>
<!-- Code coverage white list -->
<filter>
<whitelist>
<file>../core/apc-emulation.php</file>
<file>../core/ormlinkset.class.inc.php</file>
<file>../datamodels/2.x/itop-tickets/main.itop-tickets.php</file>
</whitelist>
</filter>
<testsuite name="Extensions">
<directory>../env-production/*/test</directory>
</testsuite>
</testsuites>
<!-- Code coverage white list -->
<filter>
<whitelist>
<file>../core/apc-emulation.php</file>
<file>../core/ormlinkset.class.inc.php</file>
<file>../datamodels/2.x/itop-tickets/main.itop-tickets.php</file>
</whitelist>
</filter>
</phpunit>