From: Aleksey Maksimov <ctpeko3a@gmail.com>
Date: Fri, 25 Apr 2014 13:34:17 +0000 (+0800)
Subject: Fixed assertion renamed in P3
X-Git-Tag: v0.2.23~20^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a39deafbd35a19bd7a66e420f5366daa8de39a4e;p=tools%2Fpython-jenkinsapi.git

Fixed assertion renamed in P3
---

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: