x/ci-cd-pipeline-app-murano
Code Issues Proposed changes

Fix issue in teardown when cleanup_after is used

Browse Source 
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
This commit is contained in:
Anastasia Kuznetsova 2016-08-02 13:15:52 +03:00
parent 75c710ef1c
commit 76b1023423
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/base.py
View File

@ -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()