From 5d5d7ef2c4eeb4c3a1c17daa8bc587677e153827 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 20 May 2021 20:34:18 -0700 Subject: [PATCH] qa: avoid TypeError in cleanup Fixes: https://tracker.ceph.com/issues/50933 Signed-off-by: Patrick Donnelly --- qa/tasks/vstart_runner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 5889f37577f2..eaeba38dd947 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -918,7 +918,9 @@ class LocalContext(object): self.daemons.daemons[prefixed_type][svc_id] = LocalDaemon(svc_type, svc_id) def __del__(self): - shutil.rmtree(self.teuthology_config['test_path']) + path = self.teuthology_config['test_path'] + if path is not None: + shutil.rmtree(path) def exec_test(): # Parse arguments -- 2.47.3