From 52feb3e0adda592e13cf9281cfe9da2b3afb40cf Mon Sep 17 00:00:00 2001 From: Aleksey Maksimov Date: Fri, 25 Apr 2014 21:34:17 +0800 Subject: [PATCH] Fixed assertion renamed in P3 --- jenkinsapi/build.py | 1 + jenkinsapi_tests/unittests/test_job.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jenkinsapi/build.py b/jenkinsapi/build.py index 30acd3d..556929a 100644 --- a/jenkinsapi/build.py +++ b/jenkinsapi/build.py @@ -20,6 +20,7 @@ from jenkinsapi.result_set import ResultSet from jenkinsapi.jenkinsbase import JenkinsBase from jenkinsapi.constants import STATUS_SUCCESS from jenkinsapi.custom_exceptions import NoResults +from jenkinsapi.custom_exceptions import JenkinsAPIException log = logging.getLogger(__name__) diff --git a/jenkinsapi_tests/unittests/test_job.py b/jenkinsapi_tests/unittests/test_job.py index 6fc2d92..c4d9ee1 100644 --- a/jenkinsapi_tests/unittests/test_job.py +++ b/jenkinsapi_tests/unittests/test_job.py @@ -122,8 +122,12 @@ class TestJob(unittest.TestCase): params = {'param1': 'value1', 'param2': 'value2'} ret = self.j.mk_json_from_build_parameters(build_params=params) self.assertTrue(isinstance(ret, str)) - self.assertItemsEqual(ret, - '{"parameter": [{"name": "param2", "value": "value2"}, {"name": "param1", "value": "value1"}]}') + try: + self.assertItemsEqual(ret, + '{"parameter": [{"name": "param2", "value": "value2"}, {"name": "param1", "value": "value1"}]}') + except AttributeError: + self.assertCountEqual(ret, + '{"parameter": [{"name": "param2", "value": "value2"}, {"name": "param1", "value": "value1"}]}') def test_wrong_mk_json_from_build_parameters(self): with self.assertRaises(AssertionError) as ar: -- 2.7.4