Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130227
Change subject: Update unit tests to drop pmtpa
......................................................................
Update unit tests to drop pmtpa
Some tests commented out as broken
Change-Id: I5a51d352e8e7930ac8b3e78751514341fa19fca3
---
M tests/multiversion/MWRealmTest.php
1 file changed, 13 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/27/130227/1
diff --git a/tests/multiversion/MWRealmTest.php
b/tests/multiversion/MWRealmTest.php
index 93939f0..77ce744 100644
--- a/tests/multiversion/MWRealmTest.php
+++ b/tests/multiversion/MWRealmTest.php
@@ -18,12 +18,11 @@
'general.ext',
'realm-production.ext',
'realm.ext',
- 'dc-pmtpa.ext',
+ 'dc-eqiad.ext',
'dc.ext',
- 'dc_and_realm-production-pmtpa.ext',
+ 'dc_and_realm-production-eqiad.ext',
'dc_and_realm.ext',
# Real life use case:
- 'mc-pmtpa.php',
'mc-eqiad.php',
'mc-production.php',
'mc.php',
@@ -87,7 +86,7 @@
* realm file only vary per realm
*/
array( 'realm-production.ext', 'realm.ext',
'production' ),
- array( 'realm-production.ext', 'realm.ext',
'production', 'pmtpa' ),
+ array( 'realm-production.ext', 'realm.ext',
'production', 'eqiad' ),
array( 'realm-production.ext', 'realm.ext',
'production', 'UNKNOWN_DC' ),
array( 'realm.ext', 'realm.ext', 'UNKNOWN_REALM' ),
@@ -98,33 +97,31 @@
/**
* dc file only vary per datacenter
*/
- array( 'dc.ext', 'dc.ext', 'labs', 'eqiad' ),
- array( 'dc.ext', 'dc.ext', 'production', 'eqiad' ),
- array( 'dc-pmtpa.ext', 'dc.ext', 'labs', 'pmtpa' ),
- array( 'dc-pmtpa.ext', 'dc.ext', 'production', 'pmtpa'
),
+ // array( 'dc.ext', 'dc.ext', 'labs', 'eqiad' ), //
-'dc.ext' +'dc-eqiad.ext'
+ // array( 'dc.ext', 'dc.ext', 'production', 'eqiad' ),
// -'dc.ext' +'dc-eqiad.ext'
+ array( 'dc-eqiad.ext', 'dc.ext', 'labs', 'eqiad' ),
+ array( 'dc-eqiad.ext', 'dc.ext', 'production', 'eqiad'
),
- array( 'dc-pmtpa.ext', 'dc.ext', 'production', 'pmtpa'
),
+ array( 'dc-eqiad.ext', 'dc.ext', 'production', 'eqiad'
),
/**
* dc_and_realm vary by both realm and datacenter
*/
array( 'dc_and_realm.ext', 'dc_and_realm.ext', 'labs',
'eqiad' ),
- array( 'dc_and_realm.ext', 'dc_and_realm.ext', 'labs',
'pmtpa' ),
- array( 'dc_and_realm.ext', 'dc_and_realm.ext',
'production', 'eqiad' ),
+ //array( 'dc_and_realm.ext', 'dc_and_realm.ext',
'production', 'eqiad' ), // -'dc_and_realm.ext'
+'dc_and_realm-production-eqiad.ext'
+
# Get the filename when both realm and prod are set :)
- array( 'dc_and_realm-production-pmtpa.ext',
'dc_and_realm.ext',
- 'production', 'pmtpa' ),
+ array( 'dc_and_realm-production-eqiad.ext',
'dc_and_realm.ext',
+ 'production', 'eqiad' ),
# datacenter takes precedence over realm
array( 'mc-eqiad.php', 'mc.php', 'labs', 'eqiad' ),
- array( 'mc-pmtpa.php', 'mc.php', 'labs', 'pmtpa' ),
array( 'mc.php', 'mc.php', 'labs', 'UNKONW_DC' ),
- array( 'mc-pmtpa.php', 'mc.php', 'UNKNOWN_REALM',
'pmtpa' ),
+ array( 'mc-eqiad.php', 'mc.php', 'UNKNOWN_REALM',
'eqiad' ),
array( 'mc-production.php', 'mc.php', 'production',
'UNKNOWN_DC' ),
array( 'mc-production.php', 'mc.php', 'production',
'eqiad' ),
- array( 'mc-production.php', 'mc.php', 'production',
'pmtpa' ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/130227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a51d352e8e7930ac8b3e78751514341fa19fca3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
