mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-03 14:58:42 +02:00
Code Issues Projects Releases Wiki Activity

MDL-49374 behat: Get install or re-install error code after composer

Browse Source 
After composer is installed make sure we just process only
install or re-install
This commit is contained in:
Rajesh Taneja 2015-03-20 13:18:24 +08:00
parent a149d6a177
commit c87881b0bd
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
admin/tool/behat/cli/init.php
View File

@ -96,17 +96,23 @@ if ($options['parallel']) {
$cwd = getcwd();
$output = null;
$installcomposer = true;
// If behat dependencies not downloaded then do it first, else symfony/process can't be used.
if ($options['parallel'] && !file_exists(__DIR__ . "/../../../../vendor/autoload.php")) {
$code = BEHAT_EXITCODE_COMPOSER;
} else {
chdir(__DIR__);
exec("php $utilfile --diag $paralleloption", $output, $code);
$installcomposer = false;
testing_update_composer_dependencies();
}
chdir(__DIR__);
exec("php $utilfile --diag $paralleloption", $output, $code);
// Check if composer needs to be updated.
if (($code == BEHAT_EXITCODE_INSTALL) || $code == BEHAT_EXITCODE_REINSTALL || $code == BEHAT_EXITCODE_COMPOSER) {
if ($installcomposer &&
($code == BEHAT_EXITCODE_INSTALL || $code == BEHAT_EXITCODE_REINSTALL || $code == BEHAT_EXITCODE_COMPOSER)) {
testing_update_composer_dependencies();
// Check again for behat test site and see if it's install or re-install.
chdir(__DIR__);
exec("php $utilfile --diag $paralleloption", $output, $code);
}
if ($code == 0) {
@ -137,16 +143,6 @@ if ($code == 0) {
exit($code);
}
} else if ($code == BEHAT_EXITCODE_COMPOSER) {
// Missing Behat dependencies.
// Returning to admin/tool/behat/cli.
chdir(__DIR__);
passthru("php $utilfile --install $paralleloption", $code);
if ($code != 0) {
chdir($cwd);
exit($code);
}
} else {
// Generic error, we just output it.
echo implode("\n", $output)."\n";