From ef5964ca23b2b6bafdc7f28297ddd7d5403a4148 Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Fri, 3 Apr 2015 12:49:34 -0400 Subject: [PATCH 1/2] Unicodedecodeerror handled --- test/script/regression.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/script/regression.py b/test/script/regression.py index 156a4f1b07..c0fb8554f2 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -1263,16 +1263,13 @@ class Logs(object): rep_path = rep_path.replace("\\\\", "\\") for file in os.listdir(logs_path): log = codecs.open(make_path(logs_path, file), "r", "utf_8") - for line in log: - line = line.replace(rep_path, "test_data") - if line.startswith("Exception"): - common_log.write(file +": " + line) - elif line.startswith("Error"): - common_log.write(file +": " + line) - elif line.startswith("SEVERE"): - common_log.write(file +":" + line) - else: - warning_log.write(file +": " + line) + try: + for line in log: + line = line.replace(rep_path, "test_data") + if line.startswith("SEVERE"): + common_log.write(file +": " + line) + except UnicodeDecodeError as e: + pass log.close() common_log.write("\n") common_log.close() From 3d1f5b92990d8a4fc9d7dbb2c51d176fff75bc49 Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Fri, 3 Apr 2015 13:51:56 -0400 Subject: [PATCH 2/2] diff file named appropriately --- test/script/tskdbdiff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py index d9824297c0..e88a471b7e 100755 --- a/test/script/tskdbdiff.py +++ b/test/script/tskdbdiff.py @@ -91,7 +91,7 @@ class TskDbDiff(object): self._dump_diff = TskDbDiff._get_tmp_file("DBDump-Diff", ".txt") else: self._bb_dump = os.path.join(self.output_dir, "BlackboardDump.txt") - self._bb_dump_diff = os.path.join(self.output_dir, "BlackboardDumpDiff.txt") + self._bb_dump_diff = os.path.join(self.output_dir, "BlackboardDump-Diff.txt") self._dump = os.path.join(self.output_dir, "DBDump.txt") self._dump_diff = os.path.join(self.output_dir, "DBDump-Diff.txt")