From 89ea43d0d51e6a245cbe20b92ee7228ed4a4df1c Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Tue, 15 Sep 2020 20:29:48 +0200
Subject: [PATCH] Log resource cleanup failure and carry on

Fixes #417
---
 zaza/openstack/charm_tests/test_utils.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
index ee61336..250c183 100644
--- a/zaza/openstack/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -495,6 +495,11 @@ class OpenStackBaseTest(BaseCharmTest):
                         self.nova_client.servers,
                         server.id,
                         msg="server")
+        except AssertionError as e:
+            # Resource failed to be removed within the expected time frame,
+            # log this fact and carry on.
+            logging.warning('Gave up waiting for resource cleanup: "{}"'
+                            .format(str(e)))
         except AttributeError:
             # Test did not define self.RESOURCE_PREFIX, ignore.
             pass