diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index 913c58ee8..f6a80b69b 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -1566,7 +1566,9 @@ class RunTimeEnvironment public function ExitMaintenanceMode(): void { - SetupUtils::ExitMaintenanceMode(); + if (SetupUtils::IsInMaintenanceMode()){ + SetupUtils::ExitMaintenanceMode(); + } } public function ExitReadOnlyMode() diff --git a/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php b/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php index 08721bfcd..1313d6440 100644 --- a/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php +++ b/tests/php-unit-tests/unitary-tests/setup/sequencers/DataAuditSequencerTest.php @@ -120,8 +120,8 @@ class DataAuditSequencerTest extends ItopTestCase 'status' => 1, 'message' => '', 'next-step' => 'complete', - 'next-step-label' => 'Check Completed', - 'percentage-completed' => 100, + 'next-step-label' => 'Check Completed', + 'percentage-completed' => 100, ]; $this->assertEquals($aExpected, $aRes); } @@ -328,9 +328,9 @@ class DataAuditSequencerTest extends ItopTestCase public function testIsDataAuditRequired_NoAuditTriggeredBecauseDisabled() { $oRunTimeEnvironment = $this->createMock(\RunTimeEnvironment::class); - $oRunTimeEnvironment->expects($this->once())->method('GetApplicationVersion') + $oRunTimeEnvironment->expects($this->never())->method('GetApplicationVersion') ->willReturn(['product_version' => ITOP_VERSION_FULL]); - $oRunTimeEnvironment->expects($this->once())->method("GetFinalEnv")->willReturn("production"); + $oRunTimeEnvironment->expects($this->never())->method("GetFinalEnv")->willReturn("production"); $aAdditionalParams = [ 'mode' => 'upgrade',