jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/523964 )
Change subject: [tests] Additional tests for APISite.fromDBName
......................................................................
[tests] Additional tests for APISite.fromDBName
- Take into account that 'test2wiki' is a wikpedia site and does not
have its own family file (other than 'testwiki' does)
- Take into account that 'testwikidatawiki' is a wikidata site
- Use a test list for testing APISite.fromDBName which is easier to expand
- use subTest for each test in the list
- Additional tests for APISite.fromDBName
Bug: T225723
Bug: T225590
Change-Id: I92bf81833c5e9611389fd13226f1086b5a6d71e5
---
M tests/site_tests.py
1 file changed, 18 insertions(+), 18 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 7382d75..650a77d 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -321,28 +321,28 @@
def test_constructors(self):
"""Test cases for site constructors."""
+ test_list = [
+ ['enwiki', ('en', 'wikipedia')],
+ ['eswikisource', ('es', 'wikisource')],
+ ['dewikinews', ('de', 'wikinews')],
+ ['ukwikivoyage', ('uk', 'wikivoyage')],
+ ['metawiki', ('meta', 'meta')],
+ ['commonswiki', ('commons', 'commons')],
+ ['wikidatawiki', ('wikidata', 'wikidata')],
+ ['testwikidatawiki', ('test', 'wikidata')],
+ ['testwiki', ('test', 'test')], # see T225729
+ ['test2wiki', ('test2', 'wikipedia')], # see
T225729
+ ['sourceswiki', ('mul', 'wikisource')], # see
T226960
+ ]
if isinstance(self.site.family, pywikibot.family.WikimediaFamily):
site = self.site
else:
site = None
- self.assertEqual(pywikibot.site.APISite.fromDBName('enwiki', site),
- pywikibot.Site('en', 'wikipedia'))
- self.assertEqual(
- pywikibot.site.APISite.fromDBName('eswikisource', site),
- pywikibot.Site('es', 'wikisource'))
- self.assertEqual(pywikibot.site.APISite.fromDBName('dewikinews', site),
- pywikibot.Site('de', 'wikinews'))
- self.assertEqual(
- pywikibot.site.APISite.fromDBName('ukwikivoyage', site),
- pywikibot.Site('uk', 'wikivoyage'))
- self.assertEqual(pywikibot.site.APISite.fromDBName('metawiki', site),
- pywikibot.Site('meta', 'meta'))
- self.assertEqual(
- pywikibot.site.APISite.fromDBName('commonswiki', site),
- pywikibot.Site('commons', 'commons'))
- self.assertEqual(
- pywikibot.site.APISite.fromDBName('wikidatawiki', site),
- pywikibot.Site('wikidata', 'wikidata'))
+ for dbname, site_tuple in test_list:
+ with self.subTest(dbname=dbname):
+ self.assertEqual(
+ pywikibot.site.APISite.fromDBName(dbname, site),
+ pywikibot.Site(*site_tuple))
def test_language_methods(self):
"""Test cases for languages() and related
methods."""
--
To view, visit
https://gerrit.wikimedia.org/r/523964
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: I92bf81833c5e9611389fd13226f1086b5a6d71e5
Gerrit-Change-Number: 523964
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)