|
@@ -590,14 +590,6 @@ class Benchmarker:
|
|
|
logging.info("Verifying framework URLs")
|
|
|
passed_verify = test.verify_urls(logDir)
|
|
|
|
|
|
- ##########################
|
|
|
- # Nuke /tmp
|
|
|
- ##########################
|
|
|
- try:
|
|
|
- subprocess.check_call('sudo rm -rf /tmp/*', shell=True, stderr=out, stdout=out)
|
|
|
- except Exception:
|
|
|
- out.write(header("Error: Could not empty /tmp"))
|
|
|
-
|
|
|
##########################
|
|
|
# Benchmark this test
|
|
|
##########################
|
|
@@ -618,16 +610,10 @@ class Benchmarker:
|
|
|
##########################################################
|
|
|
# Remove contents of /tmp folder
|
|
|
##########################################################
|
|
|
- if self.clear_tmp:
|
|
|
- try:
|
|
|
- filelist = [ f for f in os.listdir("/tmp") ]
|
|
|
- for f in filelist:
|
|
|
- try:
|
|
|
- os.remove("/tmp/" + f)
|
|
|
- except OSError as err:
|
|
|
- print "Failed to remove " + str(f) + " from /tmp directory: " + str(err)
|
|
|
- except OSError:
|
|
|
- print "Failed to remove contents of /tmp directory."
|
|
|
+ try:
|
|
|
+ subprocess.check_call('sudo rm -rf /tmp/*', shell=True, stderr=out, stdout=out)
|
|
|
+ except Exception:
|
|
|
+ out.write(header("Error: Could not empty /tmp"))
|
|
|
|
|
|
|
|
|
##########################################################
|