From c43d31f69379339a69938b7729d3d48fd9df5a6d Mon Sep 17 00:00:00 2001 From: Lorenzo Bolla Date: Fri, 5 Feb 2021 16:14:11 +0100 Subject: [PATCH] Don't fail hard if we can't clean Swift up --- system/swift_lib.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/system/swift_lib.py b/system/swift_lib.py index 2ddb0e15..8457276e 100644 --- a/system/swift_lib.py +++ b/system/swift_lib.py @@ -1,7 +1,9 @@ from lib import BaseTest +import logging import uuid import os + try: import swiftclient @@ -50,13 +52,21 @@ class SwiftTest(BaseTest): super(SwiftTest, self).prepare() - def shutdown(self): - if hasattr(self, "container_name"): + def _try_delete_container(self): + if not hasattr(self, "container_name"): + return + + try: for obj in swift_conn.get_container(self.container_name, full_listing=True)[1]: swift_conn.delete_object(self.container_name, obj.get("name")) swift_conn.delete_container(self.container_name) + except swiftclient.ClientException: + logging.exception("Error shutting down Swift container") + + def shutdown(self): + self._try_delete_container() super(SwiftTest, self).shutdown() def check_path(self, path):