jenkins-bot has submitted this change and it was merged. Change subject: Fix QueryGenTests test ......................................................................
Fix QueryGenTests test The parameters are not ordered. This causes a jenkins job to fail: https://integration.wikimedia.org/ci/job/pywikibot-core-tox-nose34-trusty/759/console Change-Id: Ifa7ec73b3452d5efbde55b18c532e159e4f59e93 --- M tests/aspects.py M tests/dry_api_tests.py 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index ea44585..b19df47 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -67,6 +67,16 @@ """ return self.assertRegexpMatches(*args, **kwargs) + if not hasattr(unittest.TestCase, 'assertCountEqual'): + + def assertCountEqual(self, *args, **kwargs): + """ + Wrapper of unittest.assertItemsEqual for Python 2 unittest. + + assertItemsEqual is removed in Python 3. + """ + return self.assertItemsEqual(*args, **kwargs) + def assertPageInNamespaces(self, page, namespaces): """ Assert that Pages is in namespaces. diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index cc7e876..fb6d68f 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -226,7 +226,7 @@ """Test QueryGenerator constructor.""" qGen1 = QueryGenerator(site=self.get_site(), action="query", meta="siteinfo") qGen2 = QueryGenerator(site=self.get_site(), meta="siteinfo") - self.assertEqual(str(qGen1.request), str(qGen2.request)) + self.assertCountEqual(qGen1.request._params.items(), qGen2.request._params.items()) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/170892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa7ec73b3452d5efbde55b18c532e159e4f59e93 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <[email protected]> Gerrit-Reviewer: Ladsgroup <[email protected]> Gerrit-Reviewer: Merlijn van Deen <[email protected]> Gerrit-Reviewer: XZise <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ Pywikibot-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
