From 76b102342341a302648e237594901d301f9b9604 Mon Sep 17 00:00:00 2001 From: Anastasia Kuznetsova Date: Tue, 2 Aug 2016 13:15:52 +0300 Subject: [PATCH] Fix issue in teardown when cleanup_after is used Fix error "File "tests/base.py", line 121, in tearDown os.remove(file) OSError: [Errno 21] Is a directory:" that has occured in teardown when OS_CLEANUP_AFTER is TRUE Change-Id: I9c3ad125b7c9034fe6f6bab7a0dae1acbe15289a --- tests/base.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/base.py b/tests/base.py index 0bc0fac..dc32868 100755 --- a/tests/base.py +++ b/tests/base.py @@ -16,6 +16,7 @@ import json import logging import os +import shutil import socket import time import uuid @@ -118,7 +119,10 @@ class MuranoTestsBase(testtools.TestCase, clients.ClientsBase): self.delete_stack(env) self.nova.keypairs.delete(self.keyname) for file in self.files: - os.remove(file) + if os.path.isfile(file): + os.remove(file) + elif os.path.isdir(file): + shutil.rmtree(file) super(MuranoTestsBase, self).tearDown()