From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 7 Jan 2012 04:30:23 +0000 (+0000)
Subject: r108300: also destroy the repo/backend singletons for upload test
X-Git-Tag: 1.31.0-rc.0~25456
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=29c8fd2a3f4473d92f18565b982b9880bcd0c7b7;p=lhc%2Fweb%2Fwiklou.git

r108300: also destroy the repo/backend singletons for upload test
---

diff --git a/tests/phpunit/suites/UploadFromUrlTestSuite.php b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index 5f82b5272b..6779ad4781 100644
--- a/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -75,12 +75,18 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
 			$wgStyleDirectory   = "$IP/skins";
 		}
 
+		RepoGroup::destroySingleton();
+		FileBackendGroup::destroySingleton();
 	}
 
 	public function tearDown() {
 		foreach ( $this->savedGlobals as $var => $val ) {
 			$GLOBALS[$var] = $val;
 		}
+		// Restore backends
+		RepoGroup::destroySingleton();
+		FileBackendGroup::destroySingleton();
+
 		$this->teardownUploadDir( $this->uploadDir );
 	}