openstack/swift
Code Issues Proposed changes

py3: port list_endpoints

Browse Source 
Change-Id: Ic6d0532f9f42b4d57a12aafeec5d34baffab6e23
This commit is contained in:
Samuel Merritt 2018-06-22 17:49:43 -07:00 committed by Tim Burke
parent 3698e85dcb
commit 114220279b
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
test/unit/common/middleware/test_list_endpoints.py
View File

@ -42,8 +42,8 @@ def start_response(*args):
StoragePolicy(1, 'one', True)]) StoragePolicy(1, 'one', True)])
class TestListEndpoints(unittest.TestCase): class TestListEndpoints(unittest.TestCase):
def setUp(self): def setUp(self):
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
self.testdir = mkdtemp() self.testdir = mkdtemp()
accountgz = os.path.join(self.testdir, 'account.ring.gz') accountgz = os.path.join(self.testdir, 'account.ring.gz')
@ -240,7 +240,7 @@ class TestListEndpoints(unittest.TestCase):
self.list_endpoints) self.list_endpoints)
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.content_type, 'application/json') 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.1.1:6200/sdb1/1/a/c/o1",
"http://10.1.2.2:6200/sdd1/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.list_endpoints)
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.content_type, 'application/json') 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. # Here, 'o1/' is the object name.
resp = Request.blank('/endpoints/a/c/o1/').get_response( resp = Request.blank('/endpoints/a/c/o1/').get_response(
self.list_endpoints) self.list_endpoints)
self.assertEqual(resp.status_int, 200) 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.1.1:6200/sdb1/3/a/c/o1/",
"http://10.1.2.2:6200/sdd1/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( resp = Request.blank('/endpoints/a/c2').get_response(
self.list_endpoints) self.list_endpoints)
self.assertEqual(resp.status_int, 200) 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.1.1:6200/sda1/2/a/c2",
"http://10.1.2.1:6200/sdc1/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( resp = Request.blank('/endpoints/a1').get_response(
self.list_endpoints) self.list_endpoints)
self.assertEqual(resp.status_int, 200) 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.2.1:6200/sdc1/0/a1",
"http://10.1.1.1:6200/sda1/0/a1", "http://10.1.1.1:6200/sda1/0/a1",
"http://10.1.1.1:6200/sdb1/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( resp = Request.blank('/endpoints/a/c 2').get_response(
self.list_endpoints) self.list_endpoints)
self.assertEqual(resp.status_int, 200) 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.1.1:6200/sdb1/3/a/c%202",
"http://10.1.2.2:6200/sdd1/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( resp = Request.blank('/endpoints/a/c%202').get_response(
self.list_endpoints) self.list_endpoints)
self.assertEqual(resp.status_int, 200) 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.1.1:6200/sdb1/3/a/c%202",
"http://10.1.2.2:6200/sdd1/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') \ resp = Request.blank('/endpoints/ac%20count/con%20tainer/ob%20ject') \
.get_response(self.list_endpoints) .get_response(self.list_endpoints)
self.assertEqual(resp.status_int, 200) 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.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" "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.list_endpoints)
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.status, '200 OK') self.assertEqual(resp.status, '200 OK')
self.assertEqual(resp.body, 'FakeApp') self.assertEqual(resp.body, b'FakeApp')
# test policies with custom endpoint name # test policies with custom endpoint name
for pol in POLICIES: for pol in POLICIES:
@ -341,7 +342,8 @@ class TestListEndpoints(unittest.TestCase):
.get_response(custom_path_le) .get_response(custom_path_le)
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.content_type, 'application/json') 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 # test custom path without trailing slash
custom_path_le = list_endpoints.filter_factory({ custom_path_le = list_endpoints.filter_factory({
@ -354,14 +356,15 @@ class TestListEndpoints(unittest.TestCase):
.get_response(custom_path_le) .get_response(custom_path_le)
self.assertEqual(resp.status_int, 200) self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.content_type, 'application/json') 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): def test_v1_response(self):
req = Request.blank('/endpoints/v1/a/c/o1') req = Request.blank('/endpoints/v1/a/c/o1')
resp = req.get_response(self.list_endpoints) resp = req.get_response(self.list_endpoints)
expected = ["http://10.1.1.1:6200/sdb1/1/a/c/o1", expected = ["http://10.1.1.1:6200/sdb1/1/a/c/o1",
"http://10.1.2.2:6200/sdd1/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): def test_v2_obj_response(self):
req = Request.blank('/endpoints/v2/a/c/o1') 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"], "http://10.1.2.2:6200/sdd1/1/a/c/o1"],
'headers': {'X-Backend-Storage-Policy-Index': "0"}, '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: for policy in POLICIES:
patch_path = 'swift.common.middleware.list_endpoints' \ patch_path = 'swift.common.middleware.list_endpoints' \
'.get_container_info' '.get_container_info'
@ -387,7 +390,7 @@ class TestListEndpoints(unittest.TestCase):
'X-Backend-Storage-Policy-Index': str(int(policy))}, 'X-Backend-Storage-Policy-Index': str(int(policy))},
'endpoints': [path % node for node in nodes], '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): def test_v2_non_obj_response(self):
# account # account
@ -400,7 +403,7 @@ class TestListEndpoints(unittest.TestCase):
'headers': {}, 'headers': {},
} }
# container # 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') req = Request.blank('/endpoints/v2/a/c')
resp = req.get_response(self.list_endpoints) resp = req.get_response(self.list_endpoints)
expected = { expected = {
@ -409,7 +412,7 @@ class TestListEndpoints(unittest.TestCase):
"http://10.1.2.1:6200/sdc1/0/a/c"], "http://10.1.2.1:6200/sdc1/0/a/c"],
'headers': {}, 'headers': {},
} }
self.assertEqual(resp.body, json.dumps(expected)) self.assertEqual(json.loads(resp.body.decode('utf-8')), expected)
def test_version_account_response(self): def test_version_account_response(self):
req = Request.blank('/endpoints/a') req = Request.blank('/endpoints/a')
@ -417,10 +420,10 @@ class TestListEndpoints(unittest.TestCase):
expected = ["http://10.1.2.1:6200/sdc1/0/a", 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/sda1/0/a",
"http://10.1.1.1:6200/sdb1/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') req = Request.blank('/endpoints/v1.0/a')
resp = req.get_response(self.list_endpoints) 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') req = Request.blank('/endpoints/v2/a')
resp = req.get_response(self.list_endpoints) resp = req.get_response(self.list_endpoints)
@ -430,7 +433,7 @@ class TestListEndpoints(unittest.TestCase):
"http://10.1.1.1:6200/sdb1/0/a"], "http://10.1.1.1:6200/sdb1/0/a"],
'headers': {}, 'headers': {},
} }
self.assertEqual(resp.body, json.dumps(expected)) self.assertEqual(json.loads(resp.body.decode('utf-8')), expected)
if __name__ == '__main__': if __name__ == '__main__':

1
tox.ini
View File

@ -41,6 +41,7 @@ commands =
test/unit/common/middleware/test_domain_remap.py \ test/unit/common/middleware/test_domain_remap.py \
test/unit/common/middleware/test_gatekeeper.py \ test/unit/common/middleware/test_gatekeeper.py \
test/unit/common/middleware/test_healthcheck.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/middleware/test_proxy_logging.py \
test/unit/common/ring \ test/unit/common/ring \
test/unit/common/test_bufferedhttp.py \ test/unit/common/test_bufferedhttp.py \