Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/278050
Change subject: Fix some known issues with running PHPUnit in a multiwiki
context
......................................................................
Fix some known issues with running PHPUnit in a multiwiki context
Bug: T130171
Change-Id: I82a5610a7f4eee7193509097a204a74d2b6c3acf
---
M puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
M puppet/modules/payments/manifests/init.pp
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/50/278050/1
diff --git
a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
index 9ebe940..1966205 100644
--- a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
+++ b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
@@ -1,6 +1,11 @@
<?php
// This file is managed by Puppet.
+if ( defined( 'MW_PHPUNIT_TEST' ) ) {
+ require_once '/var/www/w/MWMultiVersion.php';
+ MWMultiVersion::initializeForMaintenance();
+}
+
if ( PHP_SAPI !== 'cli' ) {
header( 'Cache-control: no-cache' );
}
diff --git a/puppet/modules/payments/manifests/init.pp
b/puppet/modules/payments/manifests/init.pp
index 01147f6..fe4f423 100644
--- a/puppet/modules/payments/manifests/init.pp
+++ b/puppet/modules/payments/manifests/init.pp
@@ -23,6 +23,9 @@
) {
include ::payments::donation_interface
+ # TODO: This can be removed once we've upgraded to MediaWiki 1.27
+ require_package('phpunit')
+
git::clone { 'mediawiki-core-fr':
remote => 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
directory => $dir,
--
To view, visit https://gerrit.wikimedia.org/r/278050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82a5610a7f4eee7193509097a204a74d2b6c3acf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
