commit 87ce9a8daca580fc933de662e96b81589a757473
author Zuul <zuul@review.opendev.org> Mon Aug 09 17:36:20 2021 +0000
committer Gerrit Code Review <review@openstack.org> Mon Aug 09 17:36:20 2021 +0000
tree a35c7ac3d6ab2831b82b291d1f33913794006517
parent 1bd6059454e024b558f0e0d54a98563a6349b29f
parent 717cc793dba2aa8f5da5d212f6e0118b92dcd1d3

Merge "Adds exception.Conflict handler to is_resource_delete function"

tempest/lib/services/object_storage/object_client.py

diff --git a/tempest/lib/services/object_storage/object_client.py b/tempest/lib/services/object_storage/object_client.py
index bb82975..65e8227 100644
--- a/tempest/lib/services/object_storage/object_client.py
+++ b/tempest/lib/services/object_storage/object_client.py
@@ -28,6 +28,8 @@
             self.get_object(container, object_name)
         except exceptions.NotFound:
             return True
+        except exceptions.Conflict:
+            return False
         return False
 
     def create_object(self, container, object_name, data,