openstack/swift
Code Issues Proposed changes

During functional tests, 404 response to a DELETE is successful

Browse Source 
Previously, we would only consider 204 responses successful, which would
cause some spurious gate failures, such as

http://logs.openstack.org/66/287666/3/check/gate-swift-dsvm-functional/c6d2673/console.html#_2016-03-03_13_41_07_846

Change-Id: Ic8c300647924352a297a2781b50064f7657038b4
This commit is contained in:
Tim Burke 2016-03-03 15:07:08 +00:00
parent 30624a866a
commit fad5fabe0a
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/functional/test_object.py
View File

@ -120,7 +120,7 @@ class TestObject(unittest2.TestCase):
for obj in objs: for obj in objs:
resp = retry(delete, container, obj) resp = retry(delete, container, obj)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# delete the container # delete the container
def delete(url, token, parsed, conn, name): def delete(url, token, parsed, conn, name):
@ -352,7 +352,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# verify dest does not exist # verify dest does not exist
resp = retry(get_dest) resp = retry(get_dest)
resp.read() resp.read()
@ -394,7 +394,7 @@ class TestObject(unittest2.TestCase):
# delete the copy # delete the copy
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
def test_copy_between_accounts(self): def test_copy_between_accounts(self):
if tf.skip: if tf.skip:
@ -460,7 +460,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete, use_account=2) resp = retry(delete, use_account=2)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# verify dest does not exist # verify dest does not exist
resp = retry(get_dest, use_account=2) resp = retry(get_dest, use_account=2)
resp.read() resp.read()
@ -504,7 +504,7 @@ class TestObject(unittest2.TestCase):
# delete the copy # delete the copy
resp = retry(delete, use_account=2) resp = retry(delete, use_account=2)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
def test_public_object(self): def test_public_object(self):
if tf.skip: if tf.skip:
@ -626,7 +626,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# clean up shared_container # clean up shared_container
def delete(url, token, parsed, conn): def delete(url, token, parsed, conn):
@ -636,7 +636,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
def test_container_write_only(self): def test_container_write_only(self):
if tf.skip or tf.skip3: if tf.skip or tf.skip3:
@ -705,7 +705,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete, use_account=3) resp = retry(delete, use_account=3)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# clean up shared_container # clean up shared_container
def delete(url, token, parsed, conn): def delete(url, token, parsed, conn):
@ -715,7 +715,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
@requires_acls @requires_acls
def test_read_only(self): def test_read_only(self):
@ -870,7 +870,7 @@ class TestObject(unittest2.TestCase):
# can delete an object # can delete an object
resp = retry(delete, self.obj, use_account=3) resp = retry(delete, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# sanity with account1 # sanity with account1
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
@ -951,7 +951,7 @@ class TestObject(unittest2.TestCase):
# can delete an object # can delete an object
resp = retry(delete, self.obj, use_account=3) resp = retry(delete, self.obj, use_account=3)
body = resp.read() body = resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# sanity with account1 # sanity with account1
resp = retry(get_listing, use_account=3) resp = retry(get_listing, use_account=3)
@ -1186,7 +1186,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete, objnum) resp = retry(delete, objnum)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# Delete the third set of segments # Delete the third set of segments
def delete(url, token, parsed, conn, objnum): def delete(url, token, parsed, conn, objnum):
@ -1197,7 +1197,7 @@ class TestObject(unittest2.TestCase):
for objnum in range(len(segments3)): for objnum in range(len(segments3)):
resp = retry(delete, objnum) resp = retry(delete, objnum)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# Delete the second set of segments # Delete the second set of segments
def delete(url, token, parsed, conn, objnum): def delete(url, token, parsed, conn, objnum):
@ -1208,7 +1208,7 @@ class TestObject(unittest2.TestCase):
for objnum in range(len(segments2)): for objnum in range(len(segments2)):
resp = retry(delete, objnum) resp = retry(delete, objnum)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# Delete the first set of segments # Delete the first set of segments
def delete(url, token, parsed, conn, objnum): def delete(url, token, parsed, conn, objnum):
@ -1219,7 +1219,7 @@ class TestObject(unittest2.TestCase):
for objnum in range(len(segments1)): for objnum in range(len(segments1)):
resp = retry(delete, objnum) resp = retry(delete, objnum)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
# Delete the extra container # Delete the extra container
def delete(url, token, parsed, conn): def delete(url, token, parsed, conn):
@ -1228,7 +1228,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
def test_delete_content_type(self): def test_delete_content_type(self):
if tf.skip: if tf.skip:
@ -1248,7 +1248,7 @@ class TestObject(unittest2.TestCase):
return check_response(conn) return check_response(conn)
resp = retry(delete) resp = retry(delete)
resp.read() resp.read()
self.assertEqual(resp.status, 204) self.assertIn(resp.status, (204, 404))
self.assertEqual(resp.getheader('Content-Type'), self.assertEqual(resp.getheader('Content-Type'),
'text/html; charset=UTF-8') 'text/html; charset=UTF-8')