jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] site_tests: Simplify messages test
......................................................................
[IMPROV] site_tests: Simplify messages test
The test in 21a67b2f was doing three different assertions and the last
assertion required the first two anyway. And the last assertion actually will
produce the most comprehensible output when it fails.
This is now also testing that no deprecation occurs when the special `*` key is
not used.
Change-Id: I1757d3bdad9ac229b838ce6ab35b30bc7520305c
---
M tests/site_tests.py
M tests/utils.py
2 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index ca22832..9f304fd 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -160,15 +160,13 @@
def test_messages_star(self):
"""Test that fetching all messages is
deprecated."""
# Load all messages and check that '*' is not a valid key.
- mysite = self.site
- self.assertIsInstance(mysite.mediawiki_messages('*'), dict)
+ self.assertEqual(self.site.mediawiki_messages('*'),
+ {'*': 'dummy entry'})
self.assertOneDeprecationParts('mediawiki_messages("*")',
'specific messages')
-
- self.assertEqual(len(mysite.mediawiki_messages(['*'])), 1)
- self.assertOneDeprecation()
- self.assertEqual(mysite.mediawiki_messages('*'), {'*': 'dummy
entry'})
- self.assertOneDeprecation()
+ self.assertEqual(self.site.mediawiki_messages(['hello']),
+ {'hello': 'world'})
+ self.assertNoDeprecation()
class TestBaseSiteProperties(TestCase):
diff --git a/tests/utils.py b/tests/utils.py
index 54731af..8fe7315 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -348,7 +348,7 @@
if self.family.name == 'wikisource':
extensions.append({'name': 'ProofreadPage'})
self._siteinfo._cache['extensions'] = (extensions, True)
- self._msgcache = {'*': 'dummy entry'}
+ self._msgcache = {'*': 'dummy entry', 'hello':
'world'}
def _build_namespaces(self):
return Namespace.builtin_namespaces(case=self.siteinfo['case'])
--
To view, visit
https://gerrit.wikimedia.org/r/236488
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1757d3bdad9ac229b838ce6ab35b30bc7520305c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>