jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/484006 )
Change subject: [tests] Fix broken tests for commons
......................................................................
[tests] Fix broken tests for commons
After T140516, commons is no longer a SingleSiteFamily.
Fix their test to be similar with wikidata.
Also split Test classes.
Bug: T213518
Change-Id: Ib3156533f8290a8c38fc999afb0a2a6c68ba4f3d
---
M tests/site_tests.py
1 file changed, 33 insertions(+), 31 deletions(-)
Approvals:
D3r1ck01: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index c0790c3..86eaca4 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Tests for the site module."""
#
-# (C) Pywikibot team, 2008-2018
+# (C) Pywikibot team, 2008-2019
#
# Distributed under the terms of the MIT license.
#
@@ -3401,7 +3401,7 @@
class TestSingleCodeFamilySite(AlteredDefaultSiteTestCase):
- """Test site without other production sites in its
family."""
+ """Test single code family sites."""
sites = {
'wikia': {
@@ -3412,18 +3412,6 @@
'family': 'lyricwiki',
'code': 'en',
},
- 'commons': {
- 'family': 'commons',
- 'code': 'commons',
- },
- 'wikidata': {
- 'family': 'wikidata',
- 'code': 'wikidata',
- },
- 'wikidatatest': {
- 'family': 'wikidata',
- 'code': 'test',
- },
}
def test_wikia(self):
@@ -3477,6 +3465,30 @@
self.assertRaises(pywikibot.UnknownSite, pywikibot.Site,
'de', 'lyricwiki')
+
+class TestProductionAndTestSite(AlteredDefaultSiteTestCase):
+
+ """Test site without other production sites in its
family."""
+
+ sites = {
+ 'commons': {
+ 'family': 'commons',
+ 'code': 'commons',
+ },
+ 'beta': {
+ 'family': 'commons',
+ 'code': 'beta',
+ },
+ 'wikidata': {
+ 'family': 'wikidata',
+ 'code': 'wikidata',
+ },
+ 'wikidatatest': {
+ 'family': 'wikidata',
+ 'code': 'test',
+ },
+ }
+
def test_commons(self):
"""Test Wikimedia Commons."""
site = self.get_site('commons')
@@ -3485,29 +3497,19 @@
self.assertIsInstance(site.namespaces, Mapping)
self.assertFalse(site.obsolete)
- self.assertEqual(site.family.hostname('en'),
'commons.wikimedia.org')
+ self.assertRaises(KeyError, site.family.hostname, 'en')
pywikibot.config.family = 'commons'
pywikibot.config.mylang = 'de'
- site2 = pywikibot.Site('en', 'commons')
- self.assertEqual(site2.code, 'commons')
+ site2 = pywikibot.Site('beta')
+ self.assertEqual(site2.hostname(),
+ 'commons.wikimedia.beta.wmflabs.org')
+ self.assertEqual(site2.code, 'beta')
self.assertFalse(site2.obsolete)
- self.assertEqual(site, site2)
- self.assertEqual(pywikibot.config.mylang, 'de')
- site2 = pywikibot.Site('really_invalid', 'commons')
- self.assertEqual(site2.code, 'commons')
- self.assertFalse(site2.obsolete)
- self.assertEqual(site, site2)
- self.assertEqual(pywikibot.config.mylang, 'de')
-
- site2 = pywikibot.Site('de', 'commons')
- self.assertEqual(site2.code, 'commons')
- self.assertFalse(site2.obsolete)
- self.assertEqual(site, site2)
- # When the code is the same as config.mylang, Site() changes mylang
- self.assertEqual(pywikibot.config.mylang, 'commons')
+ self.assertRaises(pywikibot.UnknownSite,
+ pywikibot.Site)
def test_wikidata(self):
"""Test Wikidata family, with sites for test and
production."""
--
To view, visit
https://gerrit.wikimedia.org/r/484006
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3156533f8290a8c38fc999afb0a2a6c68ba4f3d
Gerrit-Change-Number: 484006
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)