Compare commits

...

2 Commits

Author SHA1 Message Date
odain
7ac368770d N°9935 - redundant test cleanup 2026-08-17 12:40:32 +02:00
odain
eae54df7dc N°9935 - Disable data compatibility check when env-production empty 2026-08-17 12:28:11 +02:00
2 changed files with 26 additions and 1 deletions

View File

@@ -118,7 +118,11 @@ class DataAuditSequencer extends StepSequencer
}
$sFinalEnvDir = APPROOT.'env-'.$this->oRunTimeEnvironment->GetFinalEnv();
return is_dir($sFinalEnvDir);
if (! is_dir($sFinalEnvDir)) {
return false;
}
return count(glob($sFinalEnvDir."/**")) > 0;
}
public function GetStepNames(): array

View File

@@ -376,6 +376,27 @@ class DataAuditSequencerTest extends ItopTestCase
self::assertFalse($this->InvokeNonPublicMethod(DataAuditSequencer::class, "IsDataAuditRequired", $oSequencer));
}
public function testIsDataAuditRequired_NoAuditWhenEnvProductionFolderIsEmpty()
{
$oRunTimeEnvironment = $this->createMock(\RunTimeEnvironment::class);
$oRunTimeEnvironment->expects($this->once())->method('GetApplicationVersion')
->willReturn(['product_version' => ITOP_VERSION_FULL]);
$oRunTimeEnvironment->expects($this->once())->method("GetFinalEnv")->willReturn("production-gabuzomeu");
$sFolder = APPROOT.'env-production-gabuzomeu';
if (! is_dir($sFolder)) {
mkdir($sFolder);
$this->aFileToClean [] = $sFolder;
}
$aAdditionalParams = [
'mode' => 'upgrade',
'optional_steps' => ['setup-audit' => true ],
];
$oSequencer = new DataAuditSequencer($this->GivenParams($aAdditionalParams), $oRunTimeEnvironment);
self::assertFalse($this->InvokeNonPublicMethod(DataAuditSequencer::class, "IsDataAuditRequired", $oSequencer));
}
public function testIsDataAuditRequired_NoAuditTriggeredBecauseDisabled()
{
$oRunTimeEnvironment = $this->createMock(\RunTimeEnvironment::class);