From 029872edd6d90a0aa0b14ea39ae47414c5471929 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Fri, 21 Feb 2014 01:24:16 +0000
Subject: [PATCH] Fixing bugs in merge.
---
tests/PHPUnit/Fixture.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index a5ecbeb1e1..a3387710c0 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -75,8 +75,6 @@ class Fixture extends PHPUnit_Framework_Assert
private function handleConfiguration()
{
- Config::getInstance()->removeConfigOverride();
-
$testsConfig = Config::getInstance()->Tests;
if (!empty($testsConfig['persist_fixture_data'])) {
$this->dbName = get_class($this);
@@ -84,7 +82,7 @@ class Fixture extends PHPUnit_Framework_Assert
$this->dropDatabaseInTearDown = false;
$this->overwriteExisting = false;
- Config::getInstance()->database_tests['dbname'] = $this->dbName;
+ Config::getInstance()->database_tests['dbname'] = Config::getInstance()->database['dbname'] = $this->dbName;
Config::getInstance()->saveConfigOverride();
}
@@ -98,6 +96,8 @@ class Fixture extends PHPUnit_Framework_Assert
try {
\Piwik\SettingsPiwik::$piwikUrlCache = '';
+ Config::getInstance()->removeConfigOverride();
+
if ($this->createConfig) {
Config::getInstance()->setTestEnvironment();
}
@@ -168,6 +168,8 @@ class Fixture extends PHPUnit_Framework_Assert
$this->setUp();
$this->markFixtureSetUp();
+ } else {
+ echo "---Using existing database {$this->dbName}---\n\n";
}
}
--
GitLab