Merge "Removed some unnecessary code in LocalFileDeleteBatch"

[lhc/web/wiklou.git] / tests / phpunit / includes / exception / ThrottledErrorTest.php

diff --git a/tests/phpunit/includes/exception/ThrottledErrorTest.php b/tests/phpunit/includes/exception/ThrottledErrorTest.php
index ca67241..a1cf84b 100644 (file)
--- a/tests/phpunit/includes/exception/ThrottledErrorTest.php
+++ b/tests/phpunit/includes/exception/ThrottledErrorTest.php
@@ -6,27 +6,11 @@
  */
 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();
-               try{
+               $this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
+               try {
                        throw new ThrottledError();
-               }
-               catch( ThrottledError $e ) {
+               } catch ( ThrottledError $e ) {
                        $e->report();
                        $this->assertTrue( true );
                }
@@ -38,7 +22,7 @@ class ThrottledErrorTest extends MediaWikiTestCase {
                        ->getMock();
                $mock->expects( $this->once() )
                        ->method( 'setStatusCode' )
-                       ->with( 503 );
+                       ->with( 429 );
                return $mock;
        }