tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: Don't include modules which provide a phpunit.xml

Browse Source 
Some modules may require their very own phpunit configuration in order to run.
This commit is contained in:
Johannes Meyer 2019-05-13 09:20:13 +02:00
parent ed21fe280e
commit 970eb6c56a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/test/application/clicommands/PhpCommand.php
View File

@ -188,8 +188,10 @@ class PhpCommand extends Command
{ {
$modulePaths = []; $modulePaths = [];
foreach (Icinga::app()->getModuleManager()->getModuleInfo() as $module) { foreach (Icinga::app()->getModuleManager()->getModuleInfo() as $module) {
if (! file_exists($module->path . '/phpunit.xml')) {
$modulePaths[] = $module->path; $modulePaths[] = $module->path;
} }
}
$vars = array(); $vars = array();
$vars[] = sprintf('ICINGAWEB_BASEDIR=%s', $this->app->getBaseDir()); $vars[] = sprintf('ICINGAWEB_BASEDIR=%s', $this->app->getBaseDir());
@ -247,7 +249,7 @@ class PhpCommand extends Command
foreach ($app->getModuleManager()->getModuleInfo() as $module) { foreach ($app->getModuleManager()->getModuleInfo() as $module) {
$testPhp = "$module->path/test/php"; $testPhp = "$module->path/test/php";
if (file_exists($testPhp)) { if (file_exists($testPhp) && ! file_exists($module->path . '/phpunit.xml')) {
$unitModules->appendChild($phpunitXml->createElement('directory', $testPhp)); $unitModules->appendChild($phpunitXml->createElement('directory', $testPhp));
$testPhpRegression = "$testPhp/regression"; $testPhpRegression = "$testPhp/regression";