composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix tests

Browse Source
This commit is contained in:
odain
2026-04-03 08:43:40 +02:00
parent 7dd6903739
commit 0d0261b0cc
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/sequencers/StepSequencer.php
View File

@@ -38,9 +38,10 @@ abstract class StepSequencer
{
if (is_null($oRunTimeEnvironment)) {
$sEnvironment = $oParams->Get('target_env', 'production');
$oRunTimeEnvironment = new RunTimeEnvironment($sEnvironment, false);
$this->oRunTimeEnvironment = new RunTimeEnvironment($sEnvironment, false);
} else {
$this->oRunTimeEnvironment = $oRunTimeEnvironment;
}
$this->oRunTimeEnvironment = $oRunTimeEnvironment;
$this->oParams = $oParams;

4
tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
View File

@@ -55,14 +55,14 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
SetupUtils::rrmdir($sDestModulesDir);
}
SetupUtils::copydir(APPROOT.'/data/'.$sSourceEnv.'-modules', $sDestModulesDir, $bUseSymLinks);
SetupUtils::copydir(APPROOT.'/data/'.$sSourceEnv.'-modules', $sDestModulesDir, (true === $bUseSymLinks));
if ($this->bUseAdditionalFeatures) {
foreach ($this->GetExtensionFoldersToAdd() as $sExtensionCode => $sFolderPath) {
\SetupLog::Info("ExtensionFoldersToAdd: $sExtensionCode => $sFolderPath");
$sFolderName = basename($sFolderPath);
@mkdir($sDestModulesDir.DIRECTORY_SEPARATOR.$sFolderName);
SetupUtils::copydir($sFolderPath, $sDestModulesDir.DIRECTORY_SEPARATOR.$sFolderName, $bUseSymLinks);
SetupUtils::copydir($sFolderPath, $sDestModulesDir.DIRECTORY_SEPARATOR.$sFolderName, (true === $bUseSymLinks));
}
}

5
tests/php-unit-tests/unitary-tests/setup/ApplicationInstallSequencerFake.php
View File

@@ -4,7 +4,7 @@ class ApplicationInstallSequencerFake extends ApplicationInstallSequencer
{
public function __construct(Parameters $oParams)
{
$this->oParams = $oParams;
parent::__construct($oParams);
}
protected function DoLogParameters($sPrefix = 'install-', $sOperation = '')
@@ -23,10 +23,7 @@ class ApplicationInstallSequencerFake extends ApplicationInstallSequencer
{
}
protected function DoUpdateDBSchema($aSelectedModules)
{
}
protected function AfterDBCreate(
$aAdminParams,
$aSelectedModules

2
tests/php-unit-tests/unitary-tests/setup/DataAuditSequencerFake.php
View File

@@ -4,7 +4,7 @@ class DataAuditSequencerFake extends DataAuditSequencer
{
public function __construct(Parameters $oParams)
{
$this->oParams = $oParams;
paret::__construct($oParams);
}
protected function DoCopy($aCopies)

19
tests/php-unit-tests/unitary-tests/setup/StepSequencerTest.php
View File

@@ -20,6 +20,7 @@ class StepSequencerTest extends ItopTestCase
$this->RequireOnceItopFile('/setup/sequencers/DataAuditSequencer.php');
$this->RequireOnceItopFile('/setup/parameters.class.inc.php');
$this->RequireOnceItopFile('/setup/setuputils.class.inc.php');
$this->RequireOnceItopFile('/setup/runtimeenv.class.inc.php');
require_once __DIR__.'/ApplicationInstallSequencerFake.php';
require_once __DIR__.'/DataAuditSequencerFake.php';
}
@@ -27,7 +28,23 @@ class StepSequencerTest extends ItopTestCase
public function testApplicationInstallSequencer()
{
$oParams = new PHPParameters();
$oParams->LoadFromHash([]);
$aParams = [
'mode' => 'install',
'database' => [
'server' => 'server',
'user' => 'user',
'pwd' => 'pwd',
'name' => 'name',
'prefix' => 'prefix',
'db_tls_enabled' => 'db_tls_enabled',
'db_tls_ca' => 'db_tls_ca',
],
'application_path' => '',
'language' => '',
'graphviz_path' => '',
'source_dir' => '',
];
$oParams->LoadFromHash($aParams);
$oInstallSequencer = new ApplicationInstallSequencerFake($oParams);
$oInstallSequencer->ExecuteAllSteps();