Merge "Fix containers with expired objects deletion problem"

2014-02-25 11:18:59 +00:00
parent d7933d04fc a81af8c284
commit 360d4d00e2
1 changed files with 4 additions and 1 deletions
--- a/tempest/api/object_storage/base.py
+++ b/tempest/api/object_storage/base.py
@@ -130,7 +130,10 @@ class BaseObjectTest(tempest.test.BaseTestCase):
                objlist = container_client.list_all_container_objects(cont)
                # delete every object in the container
                for obj in objlist:
-                    object_client.delete_object(cont, obj['name'])
+                    try:
+                        object_client.delete_object(cont, obj['name'])
+                    except exceptions.NotFound:
+                        pass
                container_client.delete_container(cont)
            except exceptions.NotFound:
                pass