[Pywikibot-commits] [Gerrit] pywikibot/core[master]: TestAPIMWException.tearDown: Make sure warning and error methods are ...

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/437073 ) Change subject: TestAPIMWException.tearDown: Make sure warning and error methods are restored ...................................................................... TestAPIMWException.tearDown: Make sure warning and error methods are restored Fix Travis-CI failures. Bug: T196317 Change-Id: Ia3f2616be8a8bd22e858f39bc31d2945c9bde5da --- M tests/api_tests.py 1 file changed, 25 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/api_tests.py b/tests/api_tests.py index 7984fc8..cc4d535 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -86,21 +86,23 @@ def setUp(self): """Mock warning and error.""" super(TestAPIMWException, self).setUp() - self._original_warning = pywikibot.warning - pywikibot.warning = patch.object(pywikibot, 'warning').start() - self._original_error = pywikibot.error - pywikibot.error = patch.object(pywikibot, 'error').start() + self.warning_patcher = patch.object(pywikibot, 'warning') + self.error_patcher = patch.object(pywikibot, 'error') + self.warning_patcher.start() + self.error_patcher.start() def tearDown(self): """Check warning and error calls.""" - pywikibot.warning.assert_called_once_with( - 'API error internal_api_error_fake: Fake error message') - pywikibot.warning.stop() - pywikibot.error.assert_called_once_with( - 'Detected MediaWiki API exception internal_api_error_fake: ' - 'Fake error message [servedby:unittest]; raising') - pywikibot.error.stop() - super(TestAPIMWException, self).tearDown() + try: + pywikibot.warning.assert_called_with( + 'API error internal_api_error_fake: Fake error message') + pywikibot.error.assert_called_with( + 'Detected MediaWiki API exception internal_api_error_fake: ' + 'Fake error message [servedby:unittest]; raising') + finally: + self.warning_patcher.stop() + self.error_patcher.stop() + super(TestAPIMWException, self).tearDown() def test_API_error(self): """Test a static request.""" @@ -351,15 +353,18 @@ site = self.get_site() pi = api.ParamInfo(site) self.assertEqual(len(pi), 0) + with patch.object(pywikibot, 'warning') as w: pi.fetch('foobar') self.assertRaises(KeyError, pi.__getitem__, 'foobar') self.assertRaises(KeyError, pi.__getitem__, 'foobar+foobar') - w.assert_called_with( + # The warning message does not end with a '.' in older MW versions. + self.assertIn( 'API warning (paraminfo): ' - 'The module "main" does not have a submodule "foobar".') - self.assertNotIn('foobar', pi._paraminfo) + 'The module "main" does not have a submodule "foobar"', + w.call_args[0][0]) + self.assertNotIn('foobar', pi._paraminfo) self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) @@ -385,9 +390,12 @@ with patch.object(pywikibot, 'warning') as w: self.assertRaises(KeyError, pi.__getitem__, 'query+foobar') - w.assert_called_with( + # The warning message does not end with a '.' in older MW versions. + self.assertIn( 'API warning (paraminfo): ' - 'The module "query" does not have a submodule "foobar".') + 'The module "query" does not have a submodule "foobar"', + w.call_args[0][0]) + self.assertRaises(KeyError, pi.submodules, 'edit') @suppress_warnings( -- To view, visit https://gerrit.wikimedia.org/r/437073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia3f2616be8a8bd22e858f39bc31d2945c9bde5da Gerrit-Change-Number: 437073 Gerrit-PatchSet: 4 Gerrit-Owner: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Zoranzoki21 &lt;zorandori4444(a)gmail.com&gt; Gerrit-Reviewer: jenkins-bot <>