From 114220279b0662079c94eb8432c08550fe7748b3 Mon Sep 17 00:00:00 2001 From: Samuel Merritt Date: Fri, 22 Jun 2018 17:49:43 -0700 Subject: [PATCH] py3: port list_endpoints Change-Id: Ic6d0532f9f42b4d57a12aafeec5d34baffab6e23 --- .../common/middleware/test_list_endpoints.py | 45 ++++++++++--------- tox.ini | 1 + 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/test/unit/common/middleware/test_list_endpoints.py b/test/unit/common/middleware/test_list_endpoints.py index e96bd93bad..651f9422db 100644 --- a/test/unit/common/middleware/test_list_endpoints.py +++ b/test/unit/common/middleware/test_list_endpoints.py @@ -42,8 +42,8 @@ def start_response(*args): StoragePolicy(1, 'one', True)]) class TestListEndpoints(unittest.TestCase): def setUp(self): - utils.HASH_PATH_SUFFIX = 'endcap' - utils.HASH_PATH_PREFIX = '' + utils.HASH_PATH_SUFFIX = b'endcap' + utils.HASH_PATH_PREFIX = b'' self.testdir = mkdtemp() accountgz = os.path.join(self.testdir, 'account.ring.gz') @@ -240,7 +240,7 @@ class TestListEndpoints(unittest.TestCase): self.list_endpoints) self.assertEqual(resp.status_int, 200) self.assertEqual(resp.content_type, 'application/json') - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.1.1:6200/sdb1/1/a/c/o1", "http://10.1.2.2:6200/sdd1/1/a/c/o1" ]) @@ -260,13 +260,14 @@ class TestListEndpoints(unittest.TestCase): self.list_endpoints) self.assertEqual(resp.status_int, 200) self.assertEqual(resp.content_type, 'application/json') - self.assertEqual(json.loads(resp.body), expected[pol.idx]) + self.assertEqual(json.loads(resp.body.decode("utf-8")), + expected[pol.idx]) # Here, 'o1/' is the object name. resp = Request.blank('/endpoints/a/c/o1/').get_response( self.list_endpoints) self.assertEqual(resp.status_int, 200) - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.1.1:6200/sdb1/3/a/c/o1/", "http://10.1.2.2:6200/sdd1/3/a/c/o1/" ]) @@ -274,7 +275,7 @@ class TestListEndpoints(unittest.TestCase): resp = Request.blank('/endpoints/a/c2').get_response( self.list_endpoints) self.assertEqual(resp.status_int, 200) - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.1.1:6200/sda1/2/a/c2", "http://10.1.2.1:6200/sdc1/2/a/c2" ]) @@ -282,7 +283,7 @@ class TestListEndpoints(unittest.TestCase): resp = Request.blank('/endpoints/a1').get_response( self.list_endpoints) self.assertEqual(resp.status_int, 200) - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.2.1:6200/sdc1/0/a1", "http://10.1.1.1:6200/sda1/0/a1", "http://10.1.1.1:6200/sdb1/0/a1" @@ -295,7 +296,7 @@ class TestListEndpoints(unittest.TestCase): resp = Request.blank('/endpoints/a/c 2').get_response( self.list_endpoints) self.assertEqual(resp.status_int, 200) - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.1.1:6200/sdb1/3/a/c%202", "http://10.1.2.2:6200/sdd1/3/a/c%202" ]) @@ -303,7 +304,7 @@ class TestListEndpoints(unittest.TestCase): resp = Request.blank('/endpoints/a/c%202').get_response( self.list_endpoints) self.assertEqual(resp.status_int, 200) - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.1.1:6200/sdb1/3/a/c%202", "http://10.1.2.2:6200/sdd1/3/a/c%202" ]) @@ -311,7 +312,7 @@ class TestListEndpoints(unittest.TestCase): resp = Request.blank('/endpoints/ac%20count/con%20tainer/ob%20ject') \ .get_response(self.list_endpoints) self.assertEqual(resp.status_int, 200) - self.assertEqual(json.loads(resp.body), [ + self.assertEqual(json.loads(resp.body.decode("utf-8")), [ "http://10.1.1.1:6200/sdb1/3/ac%20count/con%20tainer/ob%20ject", "http://10.1.2.2:6200/sdd1/3/ac%20count/con%20tainer/ob%20ject" ]) @@ -326,7 +327,7 @@ class TestListEndpoints(unittest.TestCase): self.list_endpoints) self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status, '200 OK') - self.assertEqual(resp.body, 'FakeApp') + self.assertEqual(resp.body, b'FakeApp') # test policies with custom endpoint name for pol in POLICIES: @@ -341,7 +342,8 @@ class TestListEndpoints(unittest.TestCase): .get_response(custom_path_le) self.assertEqual(resp.status_int, 200) self.assertEqual(resp.content_type, 'application/json') - self.assertEqual(json.loads(resp.body), expected[pol.idx]) + self.assertEqual(json.loads(resp.body.decode("utf-8")), + expected[pol.idx]) # test custom path without trailing slash custom_path_le = list_endpoints.filter_factory({ @@ -354,14 +356,15 @@ class TestListEndpoints(unittest.TestCase): .get_response(custom_path_le) self.assertEqual(resp.status_int, 200) self.assertEqual(resp.content_type, 'application/json') - self.assertEqual(json.loads(resp.body), expected[pol.idx]) + self.assertEqual(json.loads(resp.body.decode("utf-8")), + expected[pol.idx]) def test_v1_response(self): req = Request.blank('/endpoints/v1/a/c/o1') resp = req.get_response(self.list_endpoints) expected = ["http://10.1.1.1:6200/sdb1/1/a/c/o1", "http://10.1.2.2:6200/sdd1/1/a/c/o1"] - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) def test_v2_obj_response(self): req = Request.blank('/endpoints/v2/a/c/o1') @@ -371,7 +374,7 @@ class TestListEndpoints(unittest.TestCase): "http://10.1.2.2:6200/sdd1/1/a/c/o1"], 'headers': {'X-Backend-Storage-Policy-Index': "0"}, } - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) for policy in POLICIES: patch_path = 'swift.common.middleware.list_endpoints' \ '.get_container_info' @@ -387,7 +390,7 @@ class TestListEndpoints(unittest.TestCase): 'X-Backend-Storage-Policy-Index': str(int(policy))}, 'endpoints': [path % node for node in nodes], } - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) def test_v2_non_obj_response(self): # account @@ -400,7 +403,7 @@ class TestListEndpoints(unittest.TestCase): 'headers': {}, } # container - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) req = Request.blank('/endpoints/v2/a/c') resp = req.get_response(self.list_endpoints) expected = { @@ -409,7 +412,7 @@ class TestListEndpoints(unittest.TestCase): "http://10.1.2.1:6200/sdc1/0/a/c"], 'headers': {}, } - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) def test_version_account_response(self): req = Request.blank('/endpoints/a') @@ -417,10 +420,10 @@ class TestListEndpoints(unittest.TestCase): expected = ["http://10.1.2.1:6200/sdc1/0/a", "http://10.1.1.1:6200/sda1/0/a", "http://10.1.1.1:6200/sdb1/0/a"] - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) req = Request.blank('/endpoints/v1.0/a') resp = req.get_response(self.list_endpoints) - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) req = Request.blank('/endpoints/v2/a') resp = req.get_response(self.list_endpoints) @@ -430,7 +433,7 @@ class TestListEndpoints(unittest.TestCase): "http://10.1.1.1:6200/sdb1/0/a"], 'headers': {}, } - self.assertEqual(resp.body, json.dumps(expected)) + self.assertEqual(json.loads(resp.body.decode('utf-8')), expected) if __name__ == '__main__': diff --git a/tox.ini b/tox.ini index e38e5c8c61..69152b867f 100644 --- a/tox.ini +++ b/tox.ini @@ -41,6 +41,7 @@ commands = test/unit/common/middleware/test_domain_remap.py \ test/unit/common/middleware/test_gatekeeper.py \ test/unit/common/middleware/test_healthcheck.py \ + test/unit/common/middleware/test_list_endpoints.py \ test/unit/common/middleware/test_proxy_logging.py \ test/unit/common/ring \ test/unit/common/test_bufferedhttp.py \