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

moodle · Feb 12, 2013 · 08eef1a · 08eef1a
2 parents 87c9271 + b048f85
commit 08eef1a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/admin/tool/behat/cli/util.php b/admin/tool/behat/cli/util.php
@@ -150,6 +150,7 @@
 require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/pluginlib.php');
 require_once($CFG->libdir.'/installlib.php');
+require_once($CFG->libdir.'/testing/classes/test_lock.php');
 
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
@@ -165,6 +166,8 @@
     behat_util::install_site();
     mtrace("Acceptance tests site installed");
 } else if ($options['drop']) {
+    // Ensure no tests are running.
+    test_lock::acquire('behat');
     behat_util::drop_site();
     mtrace("Acceptance tests site dropped");
 } else if ($options['enable']) {