Small changes to trigger new build

3 files changed, 21 insertions, 15 deletions

diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index ca53f777d0..961fa17fe3 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -49,11 +49,8 @@ class Piwik_LocalTracker extends PiwikTracker
         $plugins = Piwik_Config::getInstance()->Plugins['Plugins'];
         $pluginsTracker = Piwik_Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
         $oldTrackerConfig = Piwik_Config::getInstance()->Tracker;
-        try {
-            Piwik_PluginsManager::getInstance()->unloadPlugins();
-        } catch(Exception $e) {
-            // this fails for SegmentEditor for some reasons
-        }
+
+        Piwik_PluginsManager::getInstance()->unloadPlugins();
 
         // modify config
         $GLOBALS['PIWIK_TRACKER_MODE'] = true;
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index 9f91c7910c..db4186ffb4 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -40,7 +40,8 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase
             Piwik::createTables();
             Piwik::createLogObject();
 
-            Piwik_PluginsManager::getInstance()->loadPlugins(array());
+//            Piwik_PluginsManager::getInstance()->loadPlugins(array());
+            IntegrationTestCase::loadAllPlugins();
 
         } catch (Exception $e) {
             $this->fail("TEST INITIALIZATION FAILED: " . $e->getMessage());
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 941828d6a7..e7958db543 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -54,6 +54,22 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @param $createEmptyDatabase
+     */
+    protected static function installAndLoadPlugins($installPlugins)
+    {
+        $pluginsManager = Piwik_PluginsManager::getInstance();
+        $plugins = $pluginsManager->readPluginsDirectory();
+
+        $pluginsManager->loadPlugins($plugins);
+        if ($installPlugins)
+        {
+            $pluginsManager->installLoadedPlugins();
+        }
+    }
+
+
     public static function loadAllPlugins()
     {
         $pluginsManager = Piwik_PluginsManager::getInstance();
@@ -143,16 +159,8 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
         // We need to be SU to create websites for tests
         Piwik::setUserIsSuperUser();
         Piwik_Tracker_Cache::deleteTrackerCache();
+        self::installAndLoadPlugins( $installPlugins = $createEmptyDatabase);
 
-        // Load and install plugins
-        $pluginsManager = Piwik_PluginsManager::getInstance();
-        $plugins = $pluginsManager->readPluginsDirectory();
-
-        $pluginsManager->loadPlugins($plugins);
-        if ($createEmptyDatabase) // only install if database is empty
-        {
-            $pluginsManager->installLoadedPlugins();
-        }
 
         $_GET = $_REQUEST = array();
         $_SERVER['HTTP_REFERER'] = '';