Merge "tests: Clean up use of mt_rand()"

[lhc/web/wiklou.git] / tests / phpunit / includes / filebackend / FileBackendTest.php

diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php b/tests/phpunit/includes/filebackend/FileBackendTest.php
index e115d17..0763a2e 100644 (file)
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -79,11 +79,6 @@ class FileBackendTest extends MediaWikiTestCase {
                ) );
        }
 
-       protected function tearDown() {
-               parent::tearDown();
-               DeferredUpdates::forceDeferral( false );
-       }
-
        private static function baseStorePath() {
                return 'mwstore://localtesting';
        }
@@ -2503,7 +2498,7 @@ class FileBackendTest extends MediaWikiTestCase {
                        ) )
                );
 
-               DeferredUpdates::forceDeferral( true );
+               $this->setMwGlobals( 'wgCommandLineMode', false );
 
                $p = 'container/test-cont/file.txt';
                $be->quickCreate( array(
@@ -2521,7 +2516,6 @@ class FileBackendTest extends MediaWikiTestCase {
                );
 
                DeferredUpdates::doUpdates();
-               DeferredUpdates::forceDeferral( false );
 
                $this->assertEquals(
                        'cattitude',