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 "Make label on Special:Undelete search reflect whether search is full-text...
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
maintenance
/
MaintenanceTest.php
diff --git
a/tests/phpunit/maintenance/MaintenanceTest.php
b/tests/phpunit/maintenance/MaintenanceTest.php
index
cb3d227
..
e21e726
100644
(file)
--- a/
tests/phpunit/maintenance/MaintenanceTest.php
+++ b/
tests/phpunit/maintenance/MaintenanceTest.php
@@
-52,7
+52,6
@@
class MaintenanceFixup extends Maintenance {
* Simulates what Maintenance wants to happen at script's end.
*/
public function simulateShutdown() {
* Simulates what Maintenance wants to happen at script's end.
*/
public function simulateShutdown() {
-
if ( $this->shutdownSimulated ) {
$this->testCase->fail( __METHOD__ . " called more than once" );
}
if ( $this->shutdownSimulated ) {
$this->testCase->fail( __METHOD__ . " called more than once" );
}
@@
-175,7
+174,6
@@
class MaintenanceTest extends MediaWikiTestCase {
* after shutdown simulation.
*/
private function assertOutputPrePostShutdown( $preShutdownOutput, $expectNLAppending ) {
* after shutdown simulation.
*/
private function assertOutputPrePostShutdown( $preShutdownOutput, $expectNLAppending ) {
-
$this->assertEquals( $preShutdownOutput, $this->getActualOutput(),
"Output before shutdown simulation" );
$this->assertEquals( $preShutdownOutput, $this->getActualOutput(),
"Output before shutdown simulation" );
@@
-835,7
+833,7
@@
class MaintenanceTest extends MediaWikiTestCase {
* @covers Maintenance::setConfig
*/
public function testSetConfig() {
* @covers Maintenance::setConfig
*/
public function testSetConfig() {
- $conf = $this->
get
Mock( 'Config' );
+ $conf = $this->
create
Mock( 'Config' );
$this->m->setConfig( $conf );
$this->assertSame( $conf, $this->m->getConfig() );
}
$this->m->setConfig( $conf );
$this->assertSame( $conf, $this->m->getConfig() );
}