X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fdb%2FLBFactoryTest.php;h=a0bc038f38df99ef21aa351e8744826d5b001bcb;hb=1c5399b47191ed9621388b14dab528d066f3bcbf;hp=82ca66a5fb219e208e777cfd2c4ddb679e984f0f;hpb=9c185ca85c3c58f96e866c9347c2b7f031ddb289;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index 82ca66a5fb..a0bc038f38 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -23,6 +23,7 @@
  * @copyright © 2013 Wikimedia Foundation Inc.
  */
 
+use Wikimedia\Rdbms\LBFactory;
 use Wikimedia\Rdbms\LBFactorySimple;
 use Wikimedia\Rdbms\LBFactoryMulti;
 use Wikimedia\Rdbms\LoadBalancer;
@@ -74,6 +75,10 @@ class LBFactoryTest extends MediaWikiTestCase {
 		];
 	}
 
+	/**
+	 * @covers LBFactory::getLocalDomainID()
+	 * @covers LBFactory::resolveDomainID()
+	 */
 	public function testLBFactorySimpleServer() {
 		global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
 
@@ -99,6 +104,9 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$dbr = $lb->getConnection( DB_REPLICA );
 		$this->assertTrue( $dbr->getLBInfo( 'master' ), 'DB_REPLICA also gets the master' );
 
+		$this->assertSame( 'my_test_wiki', $factory->resolveDomainID( 'my_test_wiki' ) );
+		$this->assertSame( $factory->getLocalDomainID(), $factory->resolveDomainID( false ) );
+
 		$factory->shutdown();
 		$lb->closeAll();
 	}
@@ -573,6 +581,8 @@ class LBFactoryTest extends MediaWikiTestCase {
 	}
 
 	public function testInvalidSelectDB() {
+		// FIXME: fails under sqlite
+		$this->markTestSkippedIfDbType( 'sqlite' );
 		$dbname = 'unittest-domain'; // explodes if DB is selected
 		$factory = $this->newLBFactoryMulti(
 			[ 'localDomain' => ( new DatabaseDomain( $dbname, null, '' ) )->getId() ],
@@ -618,7 +628,6 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$time = 1526522031;
 		$agentId = md5( 'Ramsey\'s Loyal Presa Canario' );
 
-		$lbFactory = $this->newLBFactoryMulti();
 		$this->assertEquals(
 			'3@542#c47dcfb0566e7d7bc110a6128a45c93a',
 			LBFactory::makeCookieValueFromCPIndex( 3, 542, $agentId )