Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis: os.remove crashes old nose

Browse Source
This commit is contained in:
Doug Blank
2016-04-28 10:27:22 -04:00
parent 45445609dc
commit 4bea2c098a
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gramps/plugins/test/test_reports.py
View File

@ -21,6 +21,7 @@
import unittest import unittest
import os import os
import shutil
from gramps.test.test_util import Gramps from gramps.test.test_util import Gramps
@ -121,8 +122,12 @@ def report_contains(text):
print(contents) print(contents)
if options.get("files", []): if options.get("files", []):
for filename in options.get("files", []): for filename in options.get("files", []):
#os.remove(filename) if os.path.isdir(filename):
print(filename) shutil.rmtree(filename)
elif os.path.isfile(filename):
os.remove(filename)
else:
raise Exception("can't delete: " + filename)
else: else:
os.remove(report_name + "." + ext) os.remove(report_name + "." + ext)
return text in contents return text in contents
@ -134,8 +139,12 @@ def err_does_not_contain(text):
print(err) print(err)
if options.get("files", []): if options.get("files", []):
for filename in options.get("files", []): for filename in options.get("files", []):
#os.remove(filename) if os.path.isdir(filename):
print(filename) shutil.rmtree(filename)
elif os.path.isfile(filename):
os.remove(filename)
else:
raise Exception("can't delete: " + filename)
else: else:
os.remove(report_name + "." + ext) os.remove(report_name + "." + ext)
return text not in err return text not in err