regression test fixes

This commit is contained in:
Sean-M 2013-03-06 13:41:02 -05:00
parent 4c62770418
commit 4b246d215c

View File

@ -602,8 +602,8 @@ def rebuild():
dbinpth = make_local_path(case.output_dir, case.image_name, "AutopsyTestCase", "autopsy.db")
dboutpth = make_local_path(case.gold, case.image_name, "autopsy.db")
copy_file(dbinpth, dboutpth)
error_pth = make_local_path(case.gold, case.image_name, case.image_name+case.common_log)
copy_file(case.common_log_path, error_pth)
error_pth = make_local_path(case.gold, case.image_name, case.image_name+"SortedErrors.txt")
copy_file(case.sorted_log, error_pth)
# Rebuild the HTML report
htmlfolder = ""
for fs in os.listdir(os.path.join(os.getcwd(),case.output_dir, case.image_name, "AutopsyTestCase", "Reports")):
@ -840,7 +840,7 @@ def generate_common_log():
logging.critical(traceback.format_exc())
def compare_errors():
gold_dir = make_local_path(case.gold, case.image_name, case.image_name + "AutopsyErrors.txt")
gold_dir = make_local_path(case.gold, case.image_name, case.image_name + "SortedErrors.txt")
common_log = codecs.open(case.sorted_log, "r", "latin-1")
gold_log = codecs.open(gold_dir, "r", "latin-1")
gold_dat = gold_log.read()
@ -1707,7 +1707,10 @@ def execute_test():
if failedbool:
attachl.append(case.common_log_path)
attachl.insert(0, html.name)
send_email()
else:
errorem = ""
errorem += "There were no Errors.\n"
send_email()
def send_email():