openstack/swift
Code Issues Proposed changes

Merge "Make test_read_write_acl_listings more robust"

Browse Source
This commit is contained in:
Zuul 2019-05-21 23:08:21 +00:00 committed by Gerrit Code Review
commit aac771875b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/test_container.py
View File

@ -885,7 +885,7 @@ class TestContainer(unittest2.TestCase):
new_container_name = str(uuid4()) new_container_name = str(uuid4())
resp = retry(put, new_container_name, use_account=3) resp = retry(put, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEqual(resp.status, 201) self.assertIn(resp.status, (201, 202))
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEqual(resp.status, 200) self.assertEqual(resp.status, 200)
@ -894,7 +894,7 @@ class TestContainer(unittest2.TestCase):
# can also delete them # can also delete them
resp = retry(delete, new_container_name, use_account=3) resp = retry(delete, new_container_name, use_account=3)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
resp = retry(get, use_account=3) resp = retry(get, use_account=3)
listing = resp.read() listing = resp.read()
self.assertEqual(resp.status, 200) self.assertEqual(resp.status, 200)
@ -904,10 +904,10 @@ class TestContainer(unittest2.TestCase):
empty_container_name = str(uuid4()) empty_container_name = str(uuid4())
resp = retry(put, empty_container_name, use_account=1) resp = retry(put, empty_container_name, use_account=1)
resp.read() resp.read()
self.assertEqual(resp.status, 201) self.assertIn(resp.status, (201, 202))
resp = retry(delete, empty_container_name, use_account=3) resp = retry(delete, empty_container_name, use_account=3)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
@requires_acls @requires_acls
def test_read_write_acl_metadata(self): def test_read_write_acl_metadata(self):