Skip to content
Extraits de code Groupes Projets
Valider 1b0671cb rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Make sure to destroy the environment in integration tests.

parent a75bc3b6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -327,6 +327,8 @@ class Fixture extends \PHPUnit_Framework_Assert ...@@ -327,6 +327,8 @@ class Fixture extends \PHPUnit_Framework_Assert
$this->clearInMemoryCaches(); $this->clearInMemoryCaches();
Log::unsetInstance(); Log::unsetInstance();
$this->destroyEnvironment();
} }
public function clearInMemoryCaches() public function clearInMemoryCaches()
...@@ -908,4 +910,14 @@ class Fixture extends \PHPUnit_Framework_Assert ...@@ -908,4 +910,14 @@ class Fixture extends \PHPUnit_Framework_Assert
$this->piwikEnvironment = new Environment($environment = null, $this->extraDefinitions); $this->piwikEnvironment = new Environment($environment = null, $this->extraDefinitions);
$this->piwikEnvironment->init(); $this->piwikEnvironment->init();
} }
public function destroyEnvironment()
{
if ($this->piwikEnvironment === null) {
return;
}
$this->piwikEnvironment->destroy();
$this->piwikEnvironment = null;
}
} }
...@@ -76,9 +76,10 @@ abstract class IntegrationTestCase extends SystemTestCase ...@@ -76,9 +76,10 @@ abstract class IntegrationTestCase extends SystemTestCase
{ {
parent::setUp(); parent::setUp();
self::$fixture->extraDefinitions = array_merge(static::provideContainerConfigBeforeClass(), $this->provideContainerConfig()); static::$fixture->extraDefinitions = array_merge(static::provideContainerConfigBeforeClass(), $this->provideContainerConfig());
self::$fixture->createEnvironmentInstance(); static::$fixture->createEnvironmentInstance();
Db::createDatabaseObject();
Fixture::loadAllPlugins(new TestingEnvironmentVariables(), get_class($this), self::$fixture->extraPluginsToLoad); Fixture::loadAllPlugins(new TestingEnvironmentVariables(), get_class($this), self::$fixture->extraPluginsToLoad);
Access::getInstance()->setSuperUserAccess(true); Access::getInstance()->setSuperUserAccess(true);
...@@ -98,6 +99,7 @@ abstract class IntegrationTestCase extends SystemTestCase ...@@ -98,6 +99,7 @@ abstract class IntegrationTestCase extends SystemTestCase
public function tearDown() public function tearDown()
{ {
static::$fixture->clearInMemoryCaches(); static::$fixture->clearInMemoryCaches();
static::$fixture->destroyEnvironment();
parent::tearDown(); parent::tearDown();
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter