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

Merge remote-tracking branch 'origin/support/3.1' into develop

Browse Source
This commit is contained in:
Molkobain
2023-07-14 21:11:13 +02:00
parent 8df0d66fb6 125715af3f
commit 6caddb65e9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php
View File

@@ -59,8 +59,8 @@ class iTopDesignFormatTest extends ItopTestCase
$sInputXml = $this->GetFileContent($sSamplesRelDirPath.$sXmlFileName.'.input');
$oInputDesignFormat = static::GetItopFormatFromString($sInputXml);
// N° Disable test for 1.7 => 3.0 conversion on PHP 8.1.21 as it is failing due to unknown reason. Cause will be investigated next week.
if (PHP_VERSION_ID === 80121
// N°6562 Disable test for 1.7 => 3.0 conversion on PHP 8.1.21 / 8.2.8 as it is failing due to unknown reason. Cause will be investigated next week.
if ((PHP_VERSION_ID === 80121 || PHP_VERSION_ID === 80208)
&& $oInputDesignFormat->GetVersion() === "1.7" && $sTargetVersion === "3.0") {
$this->markTestSkipped("Skip test for 1.7 => 3.0 conversion on PHP 8.1.21 as it is failing due to unknown reason. Cause will be investigated next week.");
}
@@ -109,8 +109,8 @@ class iTopDesignFormatTest extends ItopTestCase
$oExpectedDesignFormat = static::GetItopFormatFromString($sExpectedXml);
$sExpectedVersion = $oExpectedDesignFormat->GetVersion();
// N° Disable test for 1.7 => 3.0 conversion on PHP 8.1.21 as it is failing due to unknown reason. Cause will be investigated next week.
if (PHP_VERSION_ID === 80121
// N°6562 Disable test for 1.7 => 3.0 conversion on PHP 8.1.21 / 8.2.8 as it is failing due to unknown reason. Cause will be investigated next week.
if ((PHP_VERSION_ID === 80121 || PHP_VERSION_ID === 80208)
&& $sInputVersion === "1.7" && $sExpectedVersion === "3.0") {
$this->markTestSkipped("Skip test for 1.7 => 3.0 conversion on PHP 8.1.21 as it is failing due to unknown reason. Cause will be investigated next week.");
}