From a2e5e2d5b75acafe5b1de0b92a9206a6a2ec4d25 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Fri, 24 Aug 2018 10:35:14 -0400 Subject: [PATCH] Fix py36 unit tests While running the unit tests under python3.6 the response and expected results were not matching up entirely correctly compared to older versions of python. Instead, parse the JSON response and compare it to the expected value as a dictionary. Change-Id: I72f882e870d5671ba02e4d429be1cb12d97c46c2 Signed-off-by: Chuck Short --- blazar/tests/api/test_root.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/blazar/tests/api/test_root.py b/blazar/tests/api/test_root.py index f3fd42f4..b848eae3 100644 --- a/blazar/tests/api/test_root.py +++ b/blazar/tests/api/test_root.py @@ -13,19 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo_serialization import jsonutils - from blazar.tests import api class TestRoot(api.APITest): def setUp(self): super(TestRoot, self).setUp() - self.versions = jsonutils.dump_as_bytes( - {"versions": - [{"status": "CURRENT", - "id": "v2.0", - "links": [{"href": "http://localhost/v2", "rel": "self"}]}]}) + self.versions = { + "versions": + [{"status": "CURRENT", + "id": "v2.0", + "links": [{"href": "http://localhost/v2", "rel": "self"}]}]} def test_version_discovery_root(self): response = self.get_json('/', @@ -33,7 +31,7 @@ class TestRoot(api.APITest): path_prefix='') self.assertEqual(300, response.status_int) self.assertEqual("application/json", response.content_type) - self.assertEqual(self.versions, response.body) + self.assertEqual(self.versions, response.json) def test_version_discovery_versions(self): response = self.get_json('/versions', @@ -41,7 +39,7 @@ class TestRoot(api.APITest): path_prefix='') self.assertEqual(300, response.status_int) self.assertEqual("application/json", response.content_type) - self.assertEqual(self.versions, response.body) + self.assertEqual(self.versions, response.json) def test_bad_uri(self): response = self.get_json('/bad/path',