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

2013-01-21 11:14:38 +08:00
parent 73ce4ac996 0ea35584ae
commit 77ea8340de
12 changed files with 1185 additions and 859 deletions
@@ -480,7 +480,7 @@ setup_DB();

 if (PHPUNIT_TEST and !PHPUNIT_UTIL) {
    // make sure tests do not run in parallel
-    phpunit_util::acquire_test_lock();
+    test_lock::acquire('phpunit');
    $dbhash = null;
    try {
        if ($dbhash = $DB->get_field('config', 'value', array('name'=>'phpunittest'))) {