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
Merge "parserTests: Do not check for DjVu support"
[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
adf8a40
..
aed2d83
100644
(file)
--- a/
tests/phpunit/includes/db/LBFactoryTest.php
+++ b/
tests/phpunit/includes/db/LBFactoryTest.php
@@
-43,7
+43,7
@@
class LBFactoryTest extends MediaWikiTestCase {
];
$this->hideDeprecated( '$wgLBFactoryConf must be updated. See RELEASE-NOTES for details' );
];
$this->hideDeprecated( '$wgLBFactoryConf must be updated. See RELEASE-NOTES for details' );
- $result =
LBFactoryMW
::getLBFactoryClass( $config );
+ $result =
MWLBFactory
::getLBFactoryClass( $config );
$this->assertEquals( $expected, $result );
}
$this->assertEquals( $expected, $result );
}
@@
-270,8
+270,9
@@
class LBFactoryTest extends MediaWikiTestCase {
);
unset( $db );
);
unset( $db );
- /** @var Database
Base
$db */
+ /** @var Database $db */
$db = $lb->getConnection( DB_MASTER, [], '' );
$db = $lb->getConnection( DB_MASTER, [], '' );
+ $lb->reuseConnection( $db ); // don't care
$this->assertEquals(
'',
$this->assertEquals(
'',
@@
-321,8
+322,9
@@
class LBFactoryTest extends MediaWikiTestCase {
$factory = $this->newLBFactoryMulti(
[ 'localDomain' => $dbname ], [ 'dbname' => $dbname ] );
$lb = $factory->getMainLB();
$factory = $this->newLBFactoryMulti(
[ 'localDomain' => $dbname ], [ 'dbname' => $dbname ] );
$lb = $factory->getMainLB();
- /** @var Database
Base
$db */
+ /** @var Database $db */
$db = $lb->getConnection( DB_MASTER, [], '' );
$db = $lb->getConnection( DB_MASTER, [], '' );
+ $lb->reuseConnection( $db ); // don't care
$this->assertEquals(
'',
$this->assertEquals(
'',