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 "Remove DatabaseSqliteMock unit test class in favor of mocking"
[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
106a13b
..
f7007e7
100644
(file)
--- a/
tests/phpunit/includes/db/LBFactoryTest.php
+++ b/
tests/phpunit/includes/db/LBFactoryTest.php
@@
-356,11
+356,11
@@
class LBFactoryTest extends MediaWikiTestCase {
$mockDB2->expects( $this->exactly( 1 ) )->method( 'lastDoneWrites' );
// Nothing to wait for on first HTTP request start
$mockDB2->expects( $this->exactly( 1 ) )->method( 'lastDoneWrites' );
// Nothing to wait for on first HTTP request start
- $cp->
initLB
( $lb1 );
- $cp->
initLB
( $lb2 );
+ $cp->
applySessionReplicationPosition
( $lb1 );
+ $cp->
applySessionReplicationPosition
( $lb2 );
// Record positions in stash on first HTTP request end
// Record positions in stash on first HTTP request end
- $cp->s
hutdownLB
( $lb1 );
- $cp->s
hutdownLB
( $lb2 );
+ $cp->s
toreSessionReplicationPosition
( $lb1 );
+ $cp->s
toreSessionReplicationPosition
( $lb2 );
$cpIndex = null;
$cp->shutdown( null, 'sync', $cpIndex );
$cpIndex = null;
$cp->shutdown( null, 'sync', $cpIndex );
@@
-395,11
+395,11
@@
class LBFactoryTest extends MediaWikiTestCase {
);
// Wait for last positions to be reached on second HTTP request start
);
// Wait for last positions to be reached on second HTTP request start
- $cp->
initLB
( $lb1 );
- $cp->
initLB
( $lb2 );
+ $cp->
applySessionReplicationPosition
( $lb1 );
+ $cp->
applySessionReplicationPosition
( $lb2 );
// Shutdown (nothing to record)
// Shutdown (nothing to record)
- $cp->s
hutdownLB
( $lb1 );
- $cp->s
hutdownLB
( $lb2 );
+ $cp->s
toreSessionReplicationPosition
( $lb1 );
+ $cp->s
toreSessionReplicationPosition
( $lb2 );
$cpIndex = null;
$cp->shutdown( null, 'sync', $cpIndex );
$cpIndex = null;
$cp->shutdown( null, 'sync', $cpIndex );