Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 1 insertions, 16 deletions

diff --git a/tests/phpunit/includes/exception/ThrottledErrorTest.php b/tests/phpunit/includes/exception/ThrottledErrorTest.php
index bdb143fa..a1cf84bc 100644
--- a/tests/phpunit/includes/exception/ThrottledErrorTest.php
+++ b/tests/phpunit/includes/exception/ThrottledErrorTest.php
@@ -6,23 +6,8 @@
  */
 class ThrottledErrorTest extends MediaWikiTestCase {
 
-	protected $wgOut;
-
-	protected function setUp() {
-		parent::setUp();
-		global $wgOut;
-		$this->wgOut = clone $wgOut;
-	}
-
-	protected function tearDown() {
-		parent::tearDown();
-		global $wgOut;
-		$wgOut = $this->wgOut;
-	}
-
 	public function testExceptionSetsStatusCode() {
-		global $wgOut;
-		$wgOut = $this->getMockWgOut();
+		$this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
 		try {
 			throw new ThrottledError();
 		} catch ( ThrottledError $e ) {