From feaf2c1409dbe2372d5042db72bca0c9c4155dd2 Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Tue, 1 Apr 2014 17:20:45 -0400 Subject: [PATCH] JavaIO flushing error fix and ensuring regression test diffs are added as email attachments. --- Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java | 4 ++-- test/script/regression.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java index 820eb6b25d..e6122bd893 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java @@ -90,7 +90,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; outputStringRedirect = null; //gc process with its streams - proc = null; + //proc = null; return output; } @@ -137,7 +137,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; logger.log(Level.INFO, aCommand + " exit value: " + exitVal); //gc process with its streams - proc = null; + //proc = null; } /** diff --git a/test/script/regression.py b/test/script/regression.py index dab7fb032a..5e8025fb5d 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -231,6 +231,10 @@ class TestRunner(object): Reports.generate_reports(test_data) if(not test_data.overall_passed): + diffFiles = [ f for f in os.listdir(test_data.output_path) if os.path.isfile(os.path.join(test_data.output_path,f)) ] + for f in diffFiles: + if f.endswith("Diff.txt"): + Errors.add_email_attachment(os.path.join(test_data.output_path, f)) Errors.add_email_attachment(test_data.common_log_path) return logres