mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 11:07:43 +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-03 14:35:36 -04:00
commit ae1441ab1b
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/script/regression.py
View File

@ -1263,16 +1263,13 @@ class Logs(object):
rep_path = rep_path.replace("\\\\", "\\") rep_path = rep_path.replace("\\\\", "\\")
for file in os.listdir(logs_path): for file in os.listdir(logs_path):
log = codecs.open(make_path(logs_path, file), "r", "utf_8") log = codecs.open(make_path(logs_path, file), "r", "utf_8")
for line in log: try:
line = line.replace(rep_path, "test_data") for line in log:
if line.startswith("Exception"): line = line.replace(rep_path, "test_data")
common_log.write(file +": " + line) if line.startswith("SEVERE"):
elif line.startswith("Error"): common_log.write(file +": " + line)
common_log.write(file +": " + line) except UnicodeDecodeError as e:
elif line.startswith("SEVERE"): pass
common_log.write(file +":" + line)
else:
warning_log.write(file +": " + line)
log.close() log.close()
common_log.write("\n") common_log.write("\n")
common_log.close() common_log.close()

2
test/script/tskdbdiff.py
View File

@ -91,7 +91,7 @@ class TskDbDiff(object):
self._dump_diff = TskDbDiff._get_tmp_file("DBDump-Diff", ".txt") self._dump_diff = TskDbDiff._get_tmp_file("DBDump-Diff", ".txt")
else: else:
self._bb_dump = os.path.join(self.output_dir, "BlackboardDump.txt") 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 = os.path.join(self.output_dir, "DBDump.txt")
self._dump_diff = os.path.join(self.output_dir, "DBDump-Diff.txt") self._dump_diff = os.path.join(self.output_dir, "DBDump-Diff.txt")