Merge "functests: Make test_PUT_metadata less flakey"
This commit is contained in:
commit
f03b03861a
@ -207,7 +207,7 @@ class TestContainer(unittest2.TestCase):
|
|||||||
name = uuid4().hex
|
name = uuid4().hex
|
||||||
resp = retry(put, name, 'Value')
|
resp = retry(put, name, 'Value')
|
||||||
resp.read()
|
resp.read()
|
||||||
self.assertEqual(resp.status, 201)
|
self.assertIn(resp.status, (201, 202))
|
||||||
resp = retry(head, name)
|
resp = retry(head, name)
|
||||||
resp.read()
|
resp.read()
|
||||||
self.assertIn(resp.status, (200, 204))
|
self.assertIn(resp.status, (200, 204))
|
||||||
@ -218,12 +218,12 @@ class TestContainer(unittest2.TestCase):
|
|||||||
self.assertEqual(resp.getheader('x-container-meta-test'), 'Value')
|
self.assertEqual(resp.getheader('x-container-meta-test'), 'Value')
|
||||||
resp = retry(delete, name)
|
resp = retry(delete, name)
|
||||||
resp.read()
|
resp.read()
|
||||||
self.assertEqual(resp.status, 204)
|
self.assertIn(resp.status, (204, 404))
|
||||||
|
|
||||||
name = uuid4().hex
|
name = uuid4().hex
|
||||||
resp = retry(put, name, '')
|
resp = retry(put, name, '')
|
||||||
resp.read()
|
resp.read()
|
||||||
self.assertEqual(resp.status, 201)
|
self.assertIn(resp.status, (201, 202))
|
||||||
resp = retry(head, name)
|
resp = retry(head, name)
|
||||||
resp.read()
|
resp.read()
|
||||||
self.assertIn(resp.status, (200, 204))
|
self.assertIn(resp.status, (200, 204))
|
||||||
@ -234,7 +234,7 @@ class TestContainer(unittest2.TestCase):
|
|||||||
self.assertIsNone(resp.getheader('x-container-meta-test'))
|
self.assertIsNone(resp.getheader('x-container-meta-test'))
|
||||||
resp = retry(delete, name)
|
resp = retry(delete, name)
|
||||||
resp.read()
|
resp.read()
|
||||||
self.assertEqual(resp.status, 204)
|
self.assertIn(resp.status, (204, 404))
|
||||||
|
|
||||||
def test_POST_metadata(self):
|
def test_POST_metadata(self):
|
||||||
if tf.skip:
|
if tf.skip:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user