Commit f03b0386 authored by Zuul's avatar Zuul Committed by Gerrit Code Review

Merge "functests: Make test_PUT_metadata less flakey"

parents 0ae1ad63 c1d17022
......@@ -207,7 +207,7 @@ class TestContainer(unittest2.TestCase):
name = uuid4().hex
resp = retry(put, name, 'Value')
resp.read()
self.assertEqual(resp.status, 201)
self.assertIn(resp.status, (201, 202))
resp = retry(head, name)
resp.read()
self.assertIn(resp.status, (200, 204))
......@@ -218,12 +218,12 @@ class TestContainer(unittest2.TestCase):
self.assertEqual(resp.getheader('x-container-meta-test'), 'Value')
resp = retry(delete, name)
resp.read()
self.assertEqual(resp.status, 204)
self.assertIn(resp.status, (204, 404))
name = uuid4().hex
resp = retry(put, name, '')
resp.read()
self.assertEqual(resp.status, 201)
self.assertIn(resp.status, (201, 202))
resp = retry(head, name)
resp.read()
self.assertIn(resp.status, (200, 204))
......@@ -234,7 +234,7 @@ class TestContainer(unittest2.TestCase):
self.assertIsNone(resp.getheader('x-container-meta-test'))
resp = retry(delete, name)
resp.read()
self.assertEqual(resp.status, 204)
self.assertIn(resp.status, (204, 404))
def test_POST_metadata(self):
if tf.skip:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment