Commit d4ab357d authored by Sebastien Robin's avatar Sebastien Robin

make sure to not make erp5testnode failing if temp folder was already removed

parent 224219d0
...@@ -408,14 +408,18 @@ branch = %(branch)s ...@@ -408,14 +408,18 @@ branch = %(branch)s
folder_path = os.path.join(temp_directory, temp_folder) folder_path = os.path.join(temp_directory, temp_folder)
if (temp_folder.startswith("tmp") or if (temp_folder.startswith("tmp") or
temp_folder.startswith("buildout")): temp_folder.startswith("buildout")):
stat = os.stat(folder_path) try:
if stat.st_uid == user_id and \ stat = os.stat(folder_path)
(now - stat.st_mtime)/86400 > self.max_temp_time: if stat.st_uid == user_id and \
self.log("deleting temp directory %r" % (folder_path,)) (now - stat.st_mtime)/86400 > self.max_temp_time:
if os.path.isdir(folder_path): self.log("deleting temp directory %r" % (folder_path,))
shutil.rmtree(folder_path) if os.path.isdir(folder_path):
else: shutil.rmtree(folder_path)
os.remove(folder_path) else:
os.remove(folder_path)
except OSError:
log("_cleanupTemporaryFiles exception", exc_info=sys.exc_info())
raise
def cleanUp(self,test_result): def cleanUp(self,test_result):
log = self.log log = self.log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment