openstack/swift
Code Issues Proposed changes

Make test_read_write_acl_listings more robust

Browse Source 
When retrying in func tests, you may get a different status if the
previous attempt succeeded.

Change-Id: Ie9bf99af1298fae5cd91fb03d5b5f13ff4873b3c
This commit is contained in:
Tim Burke 2019-04-17 21:55:09 -07:00
parent 3be4d2f64b
commit 9468e28ccf
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())
resp = retry(put, new_container_name, use_account=3)
resp.read()
self.assertEqual(resp.status, 201)
self.assertIn(resp.status, (201, 202))
resp = retry(get, use_account=3)
listing = resp.read()
self.assertEqual(resp.status, 200)
@ -894,7 +894,7 @@ class TestContainer(unittest2.TestCase):
# can also delete them
resp = retry(delete, new_container_name, use_account=3)
resp.read()
self.assertEqual(resp.status, 204)
self.assertIn(resp.status, (204, 404))
resp = retry(get, use_account=3)
listing = resp.read()
self.assertEqual(resp.status, 200)
@ -904,10 +904,10 @@ class TestContainer(unittest2.TestCase):
empty_container_name = str(uuid4())
resp = retry(put, empty_container_name, use_account=1)
resp.read()
self.assertEqual(resp.status, 201)
self.assertIn(resp.status, (201, 202))
resp = retry(delete, empty_container_name, use_account=3)
resp.read()
self.assertEqual(resp.status, 204)
self.assertIn(resp.status, (204, 404))
@requires_acls
def test_read_write_acl_metadata(self):