From 6d7d1402261126212ec95637d8ec1ab78462648a Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Wed, 11 Dec 2024 09:40:00 +0800 Subject: [PATCH] Move the check for enabling langimport tests The check for enabling the lang import tests should only be performed once all the config settings have been applied. --- runner/main/modules/docker-php/config.template.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runner/main/modules/docker-php/config.template.php b/runner/main/modules/docker-php/config.template.php index b1fb4f2..2d65656 100644 --- a/runner/main/modules/docker-php/config.template.php +++ b/runner/main/modules/docker-php/config.template.php @@ -51,13 +51,6 @@ // Skip language upgrade during the on-sync period. $CFG->skiplangupgrade = false; -// Enable tests needing language install/upgrade -// only if we have language upgrades enabled (aka, -// when we aren't skipping them). -if (empty($CFG->skiplangupgrade)) { - define('TOOL_LANGIMPORT_REMOTE_TESTS', true); -} - $CFG->wwwroot = 'http://host.name'; $CFG->dataroot = '/var/www/moodledata'; $CFG->admin = 'admin'; @@ -89,6 +82,13 @@ \moodlehq_ci_runner::apply_config_settings($config); } +// Enable tests needing language install/upgrade +// only if we have language upgrades enabled (aka, +// when we aren't skipping them). +if (empty($CFG->skiplangupgrade)) { + define('TOOL_LANGIMPORT_REMOTE_TESTS', true); +} + define('PHPUNIT_LONGTEST', true); define('PHPUNIT_PATH_TO_SASSC', '/usr/bin/sassc');