dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rdbms: Database::selectDB() update the domain and handle failure better
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
db
/
LBFactoryTest.php
diff --git
a/tests/phpunit/includes/db/LBFactoryTest.php
b/tests/phpunit/includes/db/LBFactoryTest.php
index
de861b6
..
e84998c
100644
(file)
--- a/
tests/phpunit/includes/db/LBFactoryTest.php
+++ b/
tests/phpunit/includes/db/LBFactoryTest.php
@@
-23,6
+23,7
@@
* @copyright © 2013 Wikimedia Foundation Inc.
*/
* @copyright © 2013 Wikimedia Foundation Inc.
*/
+use Wikimedia\Rdbms\LBFactory;
use Wikimedia\Rdbms\LBFactorySimple;
use Wikimedia\Rdbms\LBFactoryMulti;
use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\Rdbms\LBFactorySimple;
use Wikimedia\Rdbms\LBFactoryMulti;
use Wikimedia\Rdbms\LoadBalancer;
@@
-33,13
+34,14
@@
use Wikimedia\Rdbms\DatabaseDomain;
/**
* @group Database
/**
* @group Database
+ * @covers \Wikimedia\Rdbms\LBFactory
* @covers \Wikimedia\Rdbms\LBFactorySimple
* @covers \Wikimedia\Rdbms\LBFactoryMulti
*/
class LBFactoryTest extends MediaWikiTestCase {
/**
* @covers \Wikimedia\Rdbms\LBFactorySimple
* @covers \Wikimedia\Rdbms\LBFactoryMulti
*/
class LBFactoryTest extends MediaWikiTestCase {
/**
- * @covers MWLBFactory::getLBFactoryClass
+ * @covers MWLBFactory::getLBFactoryClass
()
* @dataProvider getLBFactoryClassProvider
*/
public function testGetLBFactoryClass( $expected, $deprecated ) {
* @dataProvider getLBFactoryClassProvider
*/
public function testGetLBFactoryClass( $expected, $deprecated ) {
@@
-75,8
+77,8
@@
class LBFactoryTest extends MediaWikiTestCase {
}
/**
}
/**
- * @covers LBFactory::getLocalDomainID()
- * @covers LBFactory::resolveDomainID()
+ * @covers
\Wikimedia\Rdbms\
LBFactory::getLocalDomainID()
+ * @covers
\Wikimedia\Rdbms\
LBFactory::resolveDomainID()
*/
public function testLBFactorySimpleServer() {
global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
*/
public function testLBFactorySimpleServer() {
global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
@@
-606,7
+608,15
@@
class LBFactoryTest extends MediaWikiTestCase {
$this->assertFalse( $db->isOpen() );
} else {
\Wikimedia\suppressWarnings();
$this->assertFalse( $db->isOpen() );
} else {
\Wikimedia\suppressWarnings();
- $this->assertFalse( $db->selectDB( 'garbage-db' ) );
+ try {
+ $this->assertFalse( $db->selectDB( 'garbage-db' ) );
+ $this->fail( "No error thrown." );
+ } catch ( \Wikimedia\Rdbms\DBExpectedError $e ) {
+ $this->assertEquals(
+ "Could not select database 'garbage-db'.",
+ $e->getMessage()
+ );
+ }
\Wikimedia\restoreWarnings();
}
}
\Wikimedia\restoreWarnings();
}
}
@@
-627,7
+637,6
@@
class LBFactoryTest extends MediaWikiTestCase {
$time = 1526522031;
$agentId = md5( 'Ramsey\'s Loyal Presa Canario' );
$time = 1526522031;
$agentId = md5( 'Ramsey\'s Loyal Presa Canario' );
- $lbFactory = $this->newLBFactoryMulti();
$this->assertEquals(
'3@542#c47dcfb0566e7d7bc110a6128a45c93a',
LBFactory::makeCookieValueFromCPIndex( 3, 542, $agentId )
$this->assertEquals(
'3@542#c47dcfb0566e7d7bc110a6128a45c93a',
LBFactory::makeCookieValueFromCPIndex( 3, 542, $agentId )