Uninstall/reinstall modules in the right order and catch exceptions (fixes test failures)

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/gallery_unit_test/controllers/test.php b/modules/gallery_unit_test/controllers/test.php
index 5084957b..543d3183 100644
--- a/modules/gallery_unit_test/controllers/test.php
+++ b/modules/gallery_unit_test/controllers/test.php
@@ -59,11 +59,14 @@ class Test_Controller extends Controller {
     Kohana::config_set('unit_test.paths', $paths);
 
     // We probably don't want to uninstall and reinstall the core every time, but let's start off
-    // this way.
-    core_installer::uninstall();
-    core_installer::install();
+    // this way.  Uninstall modules first and core last.  Ignore errors during uninstall.
+    try {
+      user_installer::uninstall();
+      core_installer::uninstall();
+    } catch (Exception $e) {
+    }
 
-    user_installer::uninstall();
+    core_installer::install();
     user_installer::install();
 
     print new Unit_Test();