Magul has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/328112 )
Change subject: Handle asserts for multiple distinct error's messages in disambcategory() ...................................................................... Handle asserts for multiple distinct error's messages in disambcategory() Bug: T153594 Change-Id: Ica91f1e9ae317c40eb9e7e5dfd931b3342377bb4 --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/12/328112/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index 12a40f4..3e1b574 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1091,9 +1091,9 @@ item = self.family.disambcatname[repo.code] except KeyError: raise Error( - 'No {repo} qualifier found for disambiguation category ' - 'name in {fam}_family file'.format(repo=repo_name, - fam=self.family.name)) + 'No qualifier found for disambiguation category name in ' + '{repo} for {fam}_family file'.format( + repo=repo_name, fam=self.family.name)) else: dp = pywikibot.ItemPage(repo, item) try: diff --git a/tests/site_tests.py b/tests/site_tests.py index 5de88b5..6e02f4d 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -278,7 +278,12 @@ try: dabcat = mysite.disambcategory() except pywikibot.Error as e: - self.assertIn('No disambiguation category name found', str(e)) + try: + self.assertIn('No disambisguation category name found', str(e)) + except AssertionError: + self.assertIn( + 'No qualifier found for disambiguation category name in ', + str(e)) else: self.assertIsInstance(dabcat, pywikibot.Category) -- To view, visit https://gerrit.wikimedia.org/r/328112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica91f1e9ae317c40eb9e7e5dfd931b3342377bb4 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Magul <tomasz.magul...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits