From 72b4a3b32d692dacfce9c706270dad8cfe21bb8d Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 5 Apr 2013 12:51:36 +1300
Subject: [PATCH] Fixing bug in tearDown
---
tests/PHPUnit/IntegrationTestCase.php | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 8e575562d2..b3f25de242 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -157,16 +157,17 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
{
Piwik::$piwikUrlCache = null;
- try {
- $plugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins();
- foreach ($plugins AS $plugin) {
- if ($dropDatabase) {
+ $plugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins();
+ foreach ($plugins AS $plugin) {
+ if ($dropDatabase) {
+ try {
$plugin->uninstall();
+ } catch(Exception $e) {
+ echo "\n There was an error uninstalling a plugin: " . $e->getMessage() . "\n";
}
}
- Piwik_PluginsManager::getInstance()->unloadPlugins();
- } catch (Exception $e) {
}
+ Piwik_PluginsManager::getInstance()->unloadPlugins();
if ($dropDatabase) {
Piwik::dropDatabase();
}
--
GitLab