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 "Removed half-assed $wgDBtransactions global."
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
maintenance
/
backupPrefetchTest.php
diff --git
a/tests/phpunit/maintenance/backupPrefetchTest.php
b/tests/phpunit/maintenance/backupPrefetchTest.php
index
9273233
..
6ec802c
100644
(file)
--- a/
tests/phpunit/maintenance/backupPrefetchTest.php
+++ b/
tests/phpunit/maintenance/backupPrefetchTest.php
@@
-1,6
+1,6
@@
<?php
<?php
-global $IP;
-require_once
( "$IP/maintenance/backupPrefetch.inc" )
;
+
+require_once
dirname( __FILE__ ) . "/../../../maintenance/backupPrefetch.inc"
;
/**
* Tests for BaseDump
/**
* Tests for BaseDump
@@
-17,11
+17,13
@@
class BaseDumpTest extends MediaWikiTestCase {
private $dump = null;
protected function tearDown() {
private $dump = null;
protected function tearDown() {
- parent::tearDown();
-
if ( $this->dump !== null ) {
$this->dump->close();
}
if ( $this->dump !== null ) {
$this->dump->close();
}
+
+ // Bug 37458, parent teardown need to be done after closing the
+ // dump or it might cause some permissions errors.
+ parent::tearDown();
}
/**
}
/**
@@
-150,7
+152,7
@@
class BaseDumpTest extends MediaWikiTestCase {
$fname = $this->getNewTempFile();
// The header of every prefetch file
$fname = $this->getNewTempFile();
// The header of every prefetch file
- $header = '<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.
6/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.6/ http://www.mediawiki.org/xml/export-0.6.xsd" version="0.6
" xml:lang="en">
+ $header = '<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.
7/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.7/ http://www.mediawiki.org/xml/export-0.7.xsd" version="0.7
" xml:lang="en">
<siteinfo>
<sitename>wikisvn</sitename>
<base>http://localhost/wiki-svn/index.php/Main_Page</base>
<siteinfo>
<sitename>wikisvn</sitename>
<base>http://localhost/wiki-svn/index.php/Main_Page</base>
@@
-195,8
+197,8
@@
class BaseDumpTest extends MediaWikiTestCase {
<ip>127.0.0.1</ip>
</contributor>
<comment>BackupDumperTestP1Summary1</comment>
<ip>127.0.0.1</ip>
</contributor>
<comment>BackupDumperTestP1Summary1</comment>
- <text xml:space="preserve">BackupDumperTestP1Text1</text>
<sha1>0bolhl6ol7i6x0e7yq91gxgaan39j87</sha1>
<sha1>0bolhl6ol7i6x0e7yq91gxgaan39j87</sha1>
+ <text xml:space="preserve">BackupDumperTestP1Text1</text>
</revision>
</page>
';
</revision>
</page>
';
@@
-207,13
+209,14
@@
class BaseDumpTest extends MediaWikiTestCase {
<id>2</id>
<revision>
<id>2</id>
<id>2</id>
<revision>
<id>2</id>
+ <parentid>5</parentid>
<timestamp>2012-04-01T16:46:05Z</timestamp>
<contributor>
<ip>127.0.0.1</ip>
</contributor>
<comment>BackupDumperTestP2Summary1</comment>
<timestamp>2012-04-01T16:46:05Z</timestamp>
<contributor>
<ip>127.0.0.1</ip>
</contributor>
<comment>BackupDumperTestP2Summary1</comment>
- <text xml:space="preserve">BackupDumperTestP2Text1</text>
<sha1>jprywrymfhysqllua29tj3sc7z39dl2</sha1>
<sha1>jprywrymfhysqllua29tj3sc7z39dl2</sha1>
+ <text xml:space="preserve">BackupDumperTestP2Text1</text>
</revision>
<revision>
<id>5</id>
</revision>
<revision>
<id>5</id>
@@
-222,8
+225,8
@@
class BaseDumpTest extends MediaWikiTestCase {
<ip>127.0.0.1</ip>
</contributor>
<comment>BackupDumperTestP2Summary4 extra</comment>
<ip>127.0.0.1</ip>
</contributor>
<comment>BackupDumperTestP2Summary4 extra</comment>
- <text xml:space="preserve">BackupDumperTestP2Text4 some additional Text</text>
<sha1>6o1ciaxa6pybnqprmungwofc4lv00wv</sha1>
<sha1>6o1ciaxa6pybnqprmungwofc4lv00wv</sha1>
+ <text xml:space="preserve">BackupDumperTestP2Text4 some additional Text</text>
</revision>
</page>
';
</revision>
</page>
';
@@
-239,8
+242,8
@@
class BaseDumpTest extends MediaWikiTestCase {
<ip>127.0.0.1</ip>
</contributor>
<comment>Talk BackupDumperTestP1 Summary1</comment>
<ip>127.0.0.1</ip>
</contributor>
<comment>Talk BackupDumperTestP1 Summary1</comment>
- <text xml:space="preserve">Talk about BackupDumperTestP1 Text1</text>
<sha1>nktofwzd0tl192k3zfepmlzxoax1lpe</sha1>
<sha1>nktofwzd0tl192k3zfepmlzxoax1lpe</sha1>
+ <text xml:space="preserve">Talk about BackupDumperTestP1 Text1</text>
</revision>
</page>
';
</revision>
</page>
';