N°6562 Re-enable failing tests

Conditional disabling was made in ea8e7c5
This commit is contained in:
Pierre Goiffon
2023-07-27 09:48:21 +02:00
parent c25c69d746
commit 97700dbf15

View File

@@ -57,12 +57,6 @@ class iTopDesignFormatTest extends ItopTestCase
$sInputXml = $this->GetFileContent($sSamplesRelDirPath.$sXmlFileName.'.input');
$oInputDesignFormat = static::GetItopFormatFromString($sInputXml);
// 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.");
}
$bResult = $oInputDesignFormat->Convert($sTargetVersion);
$aErrors = $oInputDesignFormat->GetErrors();
$this->assertCount($iExpectedErrors, $aErrors,
@@ -107,12 +101,6 @@ class iTopDesignFormatTest extends ItopTestCase
$oExpectedDesignFormat = static::GetItopFormatFromString($sExpectedXml);
$sExpectedVersion = $oExpectedDesignFormat->GetVersion();
// 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.");
}
if (version_compare($sInputVersion, $sExpectedVersion, '>=')) {
$this->markTestSkipped("This dataset correspond to a downward conversion ($sInputVersion to $sExpectedVersion) and we want to test upwards conversions => skipping !");
}