From 064b8b7fe3594089ee7262c378d1add53eeb945c Mon Sep 17 00:00:00 2001 From: Tony Levi Date: Sun, 7 Dec 2014 23:21:22 +1030 Subject: [PATCH] MDL-48517: behat: Fix reset ordering reversal (MDL-48302) --- lib/behat/classes/util.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/behat/classes/util.php b/lib/behat/classes/util.php index 713bb9f89a5..ee1f112a102 100644 --- a/lib/behat/classes/util.php +++ b/lib/behat/classes/util.php @@ -294,6 +294,12 @@ class behat_util extends testing_util { * Reset contents of all database tables to initial values, reset caches, etc. */ public static function reset_all_data() { + // Reset database. + self::reset_database(); + + // Purge dataroot directory. + self::reset_dataroot(); + // Reset all static caches. accesslib_clear_all_caches(true); // Reset the nasty strings list used during the last test. @@ -310,11 +316,5 @@ class behat_util extends testing_util { // Inform data generator. self::get_data_generator()->reset(); - - // Purge dataroot directory. - self::reset_dataroot(); - - // Reset database. - self::reset_database(); } }