X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Ftests%2FMediaWikiTestCaseTest.php;h=599b733e05a72932af961c81a02e315992e19a78;hb=f8ee3aea3f04d4c2a4b551d553b1b9694816f0eb;hp=1850f6fe5ca4578767b868c01b0941091bd4237a;hpb=ee56f00ddf0609082f8ae9a4dc3e6e1b6f54ddfd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/tests/MediaWikiTestCaseTest.php b/tests/phpunit/tests/MediaWikiTestCaseTest.php
index 1850f6fe5c..599b733e05 100644
--- a/tests/phpunit/tests/MediaWikiTestCaseTest.php
+++ b/tests/phpunit/tests/MediaWikiTestCaseTest.php
@@ -72,6 +72,7 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
 	 * @covers MediaWikiTestCase::tearDown
 	 */
 	public function testStashedGlobalsAreRestoredOnTearDown( $globalKey, $newValue ) {
+		$this->hideDeprecated( 'MediaWikiTestCase::stashMwGlobals' );
 		$this->stashMwGlobals( $globalKey );
 		$GLOBALS[$globalKey] = $newValue;
 		$this->assertEquals(
@@ -114,9 +115,6 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
 
 		$this->overrideMwServices();
 		$this->assertNotSame( $initialServices, MediaWikiServices::getInstance() );
-
-		$this->tearDown();
-		$this->assertSame( $initialServices, MediaWikiServices::getInstance() );
 	}
 
 	public function testSetService() {
@@ -126,17 +124,11 @@ class MediaWikiTestCaseTest extends MediaWikiTestCase {
 			->disableOriginalConstructor()->getMock();
 
 		$this->setService( 'DBLoadBalancer', $mockService );
-		$this->assertNotSame( $initialServices, MediaWikiServices::getInstance() );
 		$this->assertNotSame(
 			$initialService,
 			MediaWikiServices::getInstance()->getDBLoadBalancer()
 		);
 		$this->assertSame( $mockService, MediaWikiServices::getInstance()->getDBLoadBalancer() );
-
-		$this->tearDown();
-		$this->assertSame( $initialServices, MediaWikiServices::getInstance() );
-		$this->assertNotSame( $mockService, MediaWikiServices::getInstance()->getDBLoadBalancer() );
-		$this->assertSame( $initialService, MediaWikiServices::getInstance()->getDBLoadBalancer() );
 	}
 
 	/**