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

Merge remote-tracking branch 'upstream/develop' into collaborative

Browse Source
This commit is contained in:
Richard Cordovano 2015-04-13 17:33:23 -04:00
commit 87e8ae2e4d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/script/regression.py
View File

@ -845,7 +845,7 @@ class TestResultsDiffer(object):
diff_path = os.path.splitext(os.path.basename(output_file))[0] diff_path = os.path.splitext(os.path.basename(output_file))[0]
diff_path += "-Diff.txt" diff_path += "-Diff.txt"
diff_file = codecs.open(diff_path, "wb", "utf_8") diff_file = codecs.open(diff_path, "wb", "utf_8")
dffcmdlst = ["diff", "--side-by-side", output_file, gold_file] dffcmdlst = ["diff", output_file, gold_file]
subprocess.call(dffcmdlst, stdout = diff_file) subprocess.call(dffcmdlst, stdout = diff_file)
Errors.add_errors_out(diff_path) Errors.add_errors_out(diff_path)
return False return False
@ -871,7 +871,7 @@ class TestResultsDiffer(object):
gold_report_path = test_data.get_html_report_path(DBType.GOLD) gold_report_path = test_data.get_html_report_path(DBType.GOLD)
output_report_path = test_data.get_html_report_path(DBType.OUTPUT) output_report_path = test_data.get_html_report_path(DBType.OUTPUT)
try: try:
(subprocess.check_output(['diff', '-r', '-N', '-x', '*.png', '-x', '*.ico', '--side-by-side', '--ignore-matching-lines', (subprocess.check_output(['diff', '-r', '-N', '-x', '*.png', '-x', '*.ico', '--ignore-matching-lines',
'HTML Report Generated on \|Autopsy Report for case \|Case:\|Case Number:' 'HTML Report Generated on \|Autopsy Report for case \|Case:\|Case Number:'
'\|Examiner:', gold_report_path, output_report_path])) '\|Examiner:', gold_report_path, output_report_path]))
print_report("", "REPORT COMPARISON", "The test reports matched the gold reports") print_report("", "REPORT COMPARISON", "The test reports matched the gold reports")

2
test/script/tskdbdiff.py
View File

@ -139,7 +139,7 @@ class TskDbDiff(object):
# If they are different, invoke 'diff' # If they are different, invoke 'diff'
diff_file = codecs.open(diff_path, "wb", "utf_8") diff_file = codecs.open(diff_path, "wb", "utf_8")
dffcmdlst = ["diff", "--side-by-side", gold_file, output_file] dffcmdlst = ["diff", gold_file, output_file]
subprocess.call(dffcmdlst, stdout = diff_file) subprocess.call(dffcmdlst, stdout = diff_file)
return False return False