jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400397 )
Change subject: Simplify use of --plugin argument of BackupDumper
......................................................................
Simplify use of --plugin argument of BackupDumper
Since I118b92dd16fff40b253c2c1009827086ef847dc2 the classes are part of
the autoloader, so there is no need for a php file to specifiy.
This also makes the test pass on windows.
The given $IP contains the driver letter followed by a colon
(C:\Users\...).
But the string for --plugin is exploded on the colon and than there are
too much array entries, failing the test.
Change-Id: Ie4b10659730bc4bc07e59eb57fb95ee05d572dba
---
M AbstractFilter.php
M GoogleCoopFilter.php
M tests/phpunit/BackupDumperAbstractsTest.php
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbstractFilter.php b/AbstractFilter.php
index 548b540..2d00c76 100644
--- a/AbstractFilter.php
+++ b/AbstractFilter.php
@@ -4,7 +4,7 @@
* Plugin for dumpBackup.php; call as eg:
*
* php dumpBackup.php \
- * --plugin=AbstractFilter:extensions/ActiveAbstract/AbstractFilter.php \
+ * --plugin=AbstractFilter \
* --current \
* --output=gzip:/dumps/abstract.xml.gz \
* --filter=namespace:NS_MAIN \
diff --git a/GoogleCoopFilter.php b/GoogleCoopFilter.php
index a455789..418d355 100644
--- a/GoogleCoopFilter.php
+++ b/GoogleCoopFilter.php
@@ -6,7 +6,7 @@
* Usage:
*
* HOSTNAME=kamelopedia.mormo.org php dumpBackup.php \
- * --plugin=GoogleCoopFilter:Extension/ActiveAbstract/GoogleCoopFilter.php \
+ * --plugin=GoogleCoopFilter \
* --current --output=file:coop3.xml --filter=namespace:NS_MAIN \
* --filter=noredirect --filter=googlecoop
*
diff --git a/tests/phpunit/BackupDumperAbstractsTest.php
b/tests/phpunit/BackupDumperAbstractsTest.php
index e880317..0d55432 100644
--- a/tests/phpunit/BackupDumperAbstractsTest.php
+++ b/tests/phpunit/BackupDumperAbstractsTest.php
@@ -161,7 +161,7 @@
// Setting up the dump
$fname = $this->getNewTempFile();
$dumper = new BackupDumper( [
-
"--plugin=AbstractFilter:$IP/extensions/ActiveAbstract/AbstractFilter.php",
+ "--plugin=AbstractFilter",
"--output=file:" . $fname, "--filter=abstract" ] );
$dumper->startId = $this->pageId1;
$dumper->endId = $this->pageId4 + 1; // Not including the
redirect page (db isolation)
@@ -319,7 +319,7 @@
// Setting up the dump
$fname = $this->getNewTempFile();
$dumper = new BackupDumper( [
-
"--plugin=AbstractFilter:$IP/extensions/ActiveAbstract/AbstractFilter.php",
+ "--plugin=AbstractFilter",
"--current", "--output=file:" . $fname,
"--filter=namespace:NS_MAIN",
"--filter=noredirect", "--filter=abstract"
] );
--
To view, visit https://gerrit.wikimedia.org/r/400397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4b10659730bc4bc07e59eb57fb95ee05d572dba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ActiveAbstract
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
