mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 00:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Smoss/autopsy

Browse Source
This commit is contained in:
Sean moss 2013-05-17 15:41:23 -04:00
commit f238950f84
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/output/gold/nps-2008-jean(0)-archive.zip
View File

Binary file not shown.

25
test/script/regression.py
View File

@ -632,6 +632,13 @@ def run_test(image_file, count):
print_report(exceptions, "EXCEPTION", okay) print_report(exceptions, "EXCEPTION", okay)
case.autopsy_dbdump = Emailer.make_path(case.output_dir, case.image_name, case.autopsy_dbdump = Emailer.make_path(case.output_dir, case.image_name,
case.image_name + "Dump.txt") case.image_name + "Dump.txt")
autopsy_db_file = Emailer.make_path(case.output_dir, case.image_name,
"AutopsyTestCase", "autopsy.db")
autopsy_con = sqlite3.connect(autopsy_db_file)
retrieve_data(case.autopsy_data_file, autopsy_con,autopsy_db_file)
srtcmdlst = ["sort", case.autopsy_data_file, "-o", case.sorted_data_file]
subprocess.call(srtcmdlst)
dbDump()
# Now test in comparison to the gold standards # Now test in comparison to the gold standards
if not args.gold_creation: if not args.gold_creation:
try: try:
@ -658,13 +665,6 @@ def run_test(image_file, count):
print("Tests failed due to an error, try rebuilding or creating gold standards.\n") print("Tests failed due to an error, try rebuilding or creating gold standards.\n")
print(str(e) + "\n") print(str(e) + "\n")
# Make the CSV log and the html log viewer # Make the CSV log and the html log viewer
autopsy_db_file = Emailer.make_path(case.output_dir, case.image_name,
"AutopsyTestCase", "autopsy.db")
autopsy_con = sqlite3.connect(autopsy_db_file)
retrieve_data(case.autopsy_data_file, autopsy_con,autopsy_db_file)
srtcmdlst = ["sort", case.autopsy_data_file, "-o", case.sorted_data_file]
subprocess.call(srtcmdlst)
dbDump()
generate_csv(case.csv) generate_csv(case.csv)
if case.global_csv: if case.global_csv:
generate_csv(case.global_csv) generate_csv(case.global_csv)
@ -1047,16 +1047,15 @@ def generate_common_log():
logging.critical(traceback.format_exc()) logging.critical(traceback.format_exc())
def compare_data(aut, gld): def compare_data(aut, gld):
gold_dir = Emailer.make_path(case.gold, case.image_name, case.image_name + gld + ".txt") gold_dir = Emailer.make_path(case.gold, "tmp", case.image_name, case.image_name + gld + ".txt")
if(not file_exists(gold_dir)): if(not file_exists(gold_dir)):
gold_dir = Emailer.make_path(case.gold_parse, case.image_name, case.image_name + gld + ".txt") gold_dir = Emailer.make_path(case.gold_parse, "tmp", case.image_name, case.image_name + gld + ".txt")
if(not file_exists(aut)): if(not file_exists(aut)):
return return
srtd_data = codecs.open(aut, "r", "utf_8") srtd_data = codecs.open(aut, "r", "utf_8")
gold_data = codecs.open(gold_dir, "r", "utf_8") gold_data = codecs.open(gold_dir, "r", "utf_8")
gold_dat = gold_data.read() gold_dat = gold_data.read()
srtd_dat = srtd_data.read() srtd_dat = srtd_data.read()
patrn = re.compile("\d")
if (not(gold_dat == srtd_dat)): if (not(gold_dat == srtd_dat)):
diff_dir = Emailer.make_local_path(case.output_dir, case.image_name, case.image_name+gld+"-Diff.txt") diff_dir = Emailer.make_local_path(case.output_dir, case.image_name, case.image_name+gld+"-Diff.txt")
diff_file = codecs.open(diff_dir, "wb", "utf_8") diff_file = codecs.open(diff_dir, "wb", "utf_8")
@ -1067,14 +1066,14 @@ def compare_data(aut, gld):
global failedbool global failedbool
attachl.append(case.sorted_data_file) attachl.append(case.sorted_data_file)
attachl.append(diff_dir) attachl.append(diff_dir)
errorem += "There was a difference in the Database data for " + case.image_name + ".\n" errorem += "There was a difference in the Database data for " + case.image_name + " for the file " + gld + ".\n"
print("Databases didn't match.\n") print("There was a difference in the Database data for " + case.image_name + " for the file " + gld + ".\n")
failedbool = True failedbool = True
global imgfail global imgfail
imgfail = True imgfail = True
def compare_errors(): def compare_errors():
gold_dir = Emailer.make_path(case.gold, case.image_name, case.image_name + "SortedErrors.txt") gold_dir = Emailer.make_path(case.gold, "tmp", case.image_name, case.image_name + "SortedErrors.txt")
if(not file_exists(gold_dir)): if(not file_exists(gold_dir)):
gold_dir = Emailer.make_path(case.gold_parse, 'tmp', case.image_name, case.image_name + "SortedErrors.txt") gold_dir = Emailer.make_path(case.gold_parse, 'tmp', case.image_name, case.image_name + "SortedErrors.txt")
common_log = codecs.open(case.sorted_log, "r", "utf_8") common_log = codecs.open(case.sorted_log, "r", "utf_8")