diff options
| author | Aaron Schulz <aschulz@wikimedia.org> | 2019-03-28 15:37:52 -0700 |
|---|---|---|
| committer | Aaron Schulz <aschulz@wikimedia.org> | 2019-03-29 19:03:28 +0000 |
| commit | 7dbd37a7c773200b71ddece7a292c7e86efdd52b (patch) | |
| tree | 10fb423034f3b0a4290f6ae599e57c8bdb758393 /tests/phpunit/includes/jobqueue/JobQueueTest.php | |
| parent | 1a940616b174a65d26db1109ab07a2d3a0231c35 (diff) | |
| download | mediawikicore-7dbd37a7c773200b71ddece7a292c7e86efdd52b.tar.gz mediawikicore-7dbd37a7c773200b71ddece7a292c7e86efdd52b.zip | |
Make WikiMap::isCurrentWikiDbDomain() more rigorous
This already requires a DB domain ID, so there is no reason to have
hacks for trying to handle a wiki ID being passed in instead. If the
provided domain has a schema, it should not simply be ignored in the
comparison.
Change-Id: I9ced7a46fa05f32843a9a7d17391c5d0576b099c
Diffstat (limited to 'tests/phpunit/includes/jobqueue/JobQueueTest.php')
| -rw-r--r-- | tests/phpunit/includes/jobqueue/JobQueueTest.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php index 0421fe7c68d2..d38c6c70937c 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php @@ -31,7 +31,7 @@ class JobQueueTest extends MediaWikiTestCase { $baseConfig = [ 'class' => JobQueueDBSingle::class ]; } $baseConfig['type'] = 'null'; - $baseConfig['wiki'] = wfWikiID(); + $baseConfig['domain'] = WikiMap::getCurrentWikiDbDomain()->getId(); $variants = [ 'queueRand' => [ 'order' => 'random', 'claimTTL' => 0 ], 'queueRandTTL' => [ 'order' => 'random', 'claimTTL' => 10 ], @@ -75,7 +75,10 @@ class JobQueueTest extends MediaWikiTestCase { $this->markTestSkipped( $desc ); } $this->assertEquals( wfWikiID(), $queue->getWiki(), "Proper wiki ID ($desc)" ); - $this->assertEquals( wfWikiID(), $queue->getDomain(), "Proper wiki ID ($desc)" ); + $this->assertEquals( + WikiMap::getCurrentWikiDbDomain()->getId(), + $queue->getDomain(), + "Proper wiki ID ($desc)" ); } /** |