From 2ca33d1ce76023e8b286f21d2a6a74ba767345bc Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Wed, 17 Apr 2013 16:11:45 -0300 Subject: [PATCH] Make concurrent runs of FileBackendTest independent Make each run of the FileBackendTest be for a different "wiki" so you could have multiple runs at the same time without them interfering with each other. There's been intermittent failures on jenkins for this test. I'm not sure if its some race condition (which wouldn't really make sense given each run should be independent I thought), but this can't hurt. Change-Id: I3b639f1c783efc140028c3acdce35ef3f58bf66f --- tests/phpunit/includes/filebackend/FileBackendTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php b/tests/phpunit/includes/filebackend/FileBackendTest.php index 39611cbf21..a73ccf0e91 100644 --- a/tests/phpunit/includes/filebackend/FileBackendTest.php +++ b/tests/phpunit/includes/filebackend/FileBackendTest.php @@ -13,7 +13,8 @@ class FileBackendTest extends MediaWikiTestCase { protected function setUp() { global $wgFileBackends; parent::setUp(); - $tmpPrefix = wfTempDir() . '/filebackend-unittest-' . time() . '-' . mt_rand(); + $uniqueId = time() . '-' . mt_rand(); + $tmpPrefix = wfTempDir() . '/filebackend-unittest-' . $uniqueId; if ( $this->getCliArg( 'use-filebackend=' ) ) { if ( self::$backendToUse ) { $this->singleBackend = self::$backendToUse; @@ -39,6 +40,7 @@ class FileBackendTest extends MediaWikiTestCase { 'name' => 'localtesting', 'lockManager' => 'fsLockManager', #'parallelize' => 'implicit', + 'wikiId' => wfWikiID() . $uniqueId, 'containerPaths' => array( 'unittest-cont1' => "{$tmpPrefix}-localtesting-cont1", 'unittest-cont2' => "{$tmpPrefix}-localtesting-cont2" ) @@ -48,6 +50,7 @@ class FileBackendTest extends MediaWikiTestCase { 'name' => 'localtesting', 'lockManager' => 'fsLockManager', 'parallelize' => 'implicit', + 'wikiId' => wfWikiId() . $uniqueId, 'backends' => array( array( 'name' => 'localmultitesting1', -- 2.20.1