Rejigger the way we do reinstalls while Kohana is running.

core_installer::install() now takes an $initial_install param that
allows us to enforce that we're doing a clean install.  Use this in
both the scaffolding and the unit test code.

Greatly simplify the scaffolding uninstall/reinstall code.

1 files changed, 4 insertions, 2 deletions

diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 92d3f117..7a277aa7 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -89,14 +89,16 @@ class Gallery_Unit_Test_Controller extends Controller {
     @system("rm -rf test/var");
     @mkdir('test/var/logs', 0777, true);
 
-    // Reset our loaded modules
+    // Reset our caches
     module::$module_names = array();
     module::$modules = array();
     module::$var_cache = array();
+    $db->clear_cache();
 
     // Install all modules
     // Force core and user to be installed first to resolve dependencies.
-    module::install("core");
+    core_installer::install(true);
+    module::load_modules();
     module::install("user");
     $modules = array();
     foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {