commit 360d4d00e278ecbc0c7f88e4c2d3b8d7e965091c
author Jenkins <jenkins@review.openstack.org> Tue Feb 25 11:18:59 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 25 11:18:59 2014 +0000
tree df37973e18621992be81b9ef156006253f753a35
parent d7933d04fcdef0682785e290e9310f22237c5b66
parent a81af8c2844366034483c584d05c515ab5bd5d61

Merge "Fix containers with expired objects deletion problem"

tempest/api/object_storage/base.py

diff --git a/tempest/api/object_storage/base.py b/tempest/api/object_storage/base.py
index d08dc34..45c895b 100644
--- a/tempest/api/object_storage/base.py
+++ b/tempest/api/object_storage/base.py
@@ -130,7 +130,10 @@
                 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