moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle

Browse source
This commit is contained in:
Dan Poltawski 2013-02-12 15:44:17 +08:00
commit 5c70d6505a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/testing/classes/util.php
View file

@ -123,7 +123,7 @@ abstract class testing_util {
* *
* @return bool * @return bool
*/ */
protected static function is_test_data_updated() { public static function is_test_data_updated() {
global $CFG; global $CFG;
$framework = self::get_framework(); $framework = self::get_framework();

6
lib/tests/behat/behat_hooks.php
View file

@ -69,6 +69,7 @@ class behat_hooks extends behat_base {
define('BEHAT_RUNNING', 1); define('BEHAT_RUNNING', 1);
define('CLI_SCRIPT', 1); define('CLI_SCRIPT', 1);
// With BEHAT_RUNNING we will be using $CFG->behat_* instead of $CFG->dataroot, $CFG->prefix and $CFG->wwwroot.
require_once(__DIR__ . '/../../../config.php'); require_once(__DIR__ . '/../../../config.php');
// Now that we are MOODLE_INTERNAL. // Now that we are MOODLE_INTERNAL.
@ -88,6 +89,11 @@ class behat_hooks extends behat_base {
throw new Exception($CFG->behat_wwwroot . ' is not available, ensure you started your PHP built-in server. More info in ' . behat_command::DOCS_URL . '#Running_tests'); throw new Exception($CFG->behat_wwwroot . ' is not available, ensure you started your PHP built-in server. More info in ' . behat_command::DOCS_URL . '#Running_tests');
} }
// Prevents using outdated data, upgrade script would start and tests would fail.
if (!behat_util::is_test_data_updated()) {
$commandpath = 'php admin/tool/behat/cli/util.php';
throw new Exception('Your behat test site is outdated, please run ' . $commandpath . ' from your moodle dirroot to drop and install the behat test site again.');
}
// Avoid parallel tests execution, it continues when the previous lock is released. // Avoid parallel tests execution, it continues when the previous lock is released.
test_lock::acquire('behat'); test_lock::acquire('behat');
} }