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

Merge pull request #1466 from sleuthkit/fix_diff_order

Browse Source 
Fixed order of diff arguments
This commit is contained in:
Richard Cordovano 2015-07-28 11:50:20 -04:00
commit 2d0a6b65b7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/script/regression.py
View File

@ -870,7 +870,9 @@ 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", output_file, gold_file]
# Gold needs to be passed in before output.
dffcmdlst = ["diff", gold_file, output_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)
@ -902,7 +904,8 @@ 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', '--ignore-matching-lines', # Ensure gold is passed before output
(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")

1
test/script/tskdbdiff.py
View File

@ -139,6 +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")
# Gold needs to be passed in as 1st arg and output as 2nd
dffcmdlst = ["diff", gold_file, output_file] dffcmdlst = ["diff", gold_file, output_file]
subprocess.call(dffcmdlst, stdout = diff_file) subprocess.call(dffcmdlst, stdout = diff_file)