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 "Special:Preferences: Use OOjs UI"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
maintenance
/
DumpTestCase.php
diff --git
a/tests/phpunit/maintenance/DumpTestCase.php
b/tests/phpunit/maintenance/DumpTestCase.php
index
1d55ab8
..
58cb6f3
100644
(file)
--- a/
tests/phpunit/maintenance/DumpTestCase.php
+++ b/
tests/phpunit/maintenance/DumpTestCase.php
@@
-35,7
+35,7
@@
abstract class DumpTestCase extends MediaWikiLangTestCase {
*/
protected function checkHasGzip() {
if ( self::$hasGzip === null ) {
*/
protected function checkHasGzip() {
if ( self::$hasGzip === null ) {
- self::$hasGzip = (
Installer::locateExecutable
InDefaultPaths( 'gzip' ) !== false );
+ self::$hasGzip = (
ExecutableFinder::find
InDefaultPaths( 'gzip' ) !== false );
}
if ( !self::$hasGzip ) {
}
if ( !self::$hasGzip ) {
@@
-298,7
+298,6
@@
abstract class DumpTestCase extends MediaWikiLangTestCase {
* @param string $name Title of the current page
*/
protected function assertPageStart( $id, $ns, $name ) {
* @param string $name Title of the current page
*/
protected function assertPageStart( $id, $ns, $name ) {
-
$this->assertNodeStart( "page" );
$this->skipWhitespace();
$this->assertNodeStart( "page" );
$this->skipWhitespace();
@@
-393,7
+392,6
@@
abstract class DumpTestCase extends MediaWikiLangTestCase {
if ( ( $this->xml->nodeType == XMLReader::END_ELEMENT )
&& ( $this->xml->name == "text" )
) {
if ( ( $this->xml->nodeType == XMLReader::END_ELEMENT )
&& ( $this->xml->name == "text" )
) {
-
$this->xml->read();
}
$this->skipWhitespace();
$this->xml->read();
}
$this->skipWhitespace();