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

diff --combined tests/phpunit/includes/filebackend/FileBackendTest.php
index 94e6231,e115d17..0763a2e
--- 1/tests/phpunit/includes/filebackend/FileBackendTest.php
--- 2/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@@ -18,7 -18,6 +18,6 @@@ class FileBackendTest extends MediaWiki
        protected function setUp() {
                global $wgFileBackends;
                parent::setUp();
-               $uniqueId = time() . '-' . mt_rand();
                $tmpDir = $this->getNewTempDirectory();
                if ( $this->getCliArg( 'use-filebackend' ) ) {
                        if ( self::$backendToUse ) {
@@@ -58,7 -57,7 +57,7 @@@
                        'name' => 'localtesting',
                        'lockManager' => LockManagerGroup::singleton()->get( 'fsLockManager' ),
                        'parallelize' => 'implicit',
-                       'wikiId' => wfWikiId() . $uniqueId,
+                       'wikiId' => wfWikiId() . wfRandomString(),
                        'backends' => array(
                                array(
                                        'name' => 'localmultitesting1',
@@@ -80,6 -79,11 +79,6 @@@
                ) );
        }
  
 -      protected function tearDown() {
 -              parent::tearDown();
 -              DeferredUpdates::forceDeferral( false );
 -      }
 -
        private static function baseStorePath() {
                return 'mwstore://localtesting';
        }
@@@ -2499,7 -2503,7 +2498,7 @@@
                        ) )
                );
  
 -              DeferredUpdates::forceDeferral( true );
 +              $this->setMwGlobals( 'wgCommandLineMode', false );
  
                $p = 'container/test-cont/file.txt';
                $be->quickCreate( array(
@@@ -2517,6 -2521,7 +2516,6 @@@
                );
  
                DeferredUpdates::doUpdates();
 -              DeferredUpdates::forceDeferral( false );
  
                $this->assertEquals(
                        'cattitude',