composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-26 03:58:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	tests/php-unit-tests/unitary-tests/core/OQLTest.php
#	tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
#	tests/php-unit-tests/unitary-tests/webservices/RestTest.php
This commit is contained in:
Pierre Goiffon
2023-01-16 11:36:02 +01:00
parent d7b94fb123 f65e14397c
commit 0a7c8f9fd1
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
View File

@@ -44,10 +44,10 @@ class iTopConfigParserTest extends ItopTestCase
parent::tearDown();
if ($this->conf_exists) {
// restoring config that was in place before the test
$sBackupConfigFileContent = file_get_contents($this->tmpSavePath);
$hItopConfigFile = @fopen($this->sConfigPath, 'w');
fwrite($hItopConfigFile, $sBackupConfigFileContent);
fclose($hItopConfigFile);
@chmod($this->sConfigPath, 0770);
$bRenameResult = rename($this->tmpSavePath, $this->sConfigPath);
echo "Restored config file, result={$bRenameResult}";
@chmod($this->sConfigPath, 0440);
}
}