codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1157 from sidheshenator/regression-test-fix

Browse Source 
Regression test fix
This commit is contained in:
Richard Cordovano
2015-03-31 12:22:36 -04:00
parent b1305d20fa 41b96b7d27
commit 34e933e299
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/script/regression.py
View File

@@ -333,7 +333,7 @@ class TestRunner(object):
tmpdir = make_path(gold_dir, test_data.image_name)
dbinpth = test_data.get_db_path(DBType.OUTPUT)
dboutpth = make_path(tmpdir, DB_FILENAME)
dataoutpth = make_path(tmpdir, test_data.image_name + "SortedData.txt")
dataoutpth = make_path(tmpdir, test_data.image_name + "BlackboardDump.txt")
dbdumpinpth = test_data.get_db_dump_path(DBType.OUTPUT)
dbdumpoutpth = make_path(tmpdir, test_data.image_name + "DBDump.txt")
if not os.path.exists(test_config.img_gold):
@@ -571,7 +571,7 @@ class TestData(object):
return make_path(html_path, os.listdir(html_path)[0])
def get_sorted_data_path(self, file_type):
"""Get the path to the SortedData file that corresponds to the given DBType.
"""Get the path to the BlackboardDump file that corresponds to the given DBType.
Args:
file_type: the DBType of the path to be generated
@@ -579,13 +579,13 @@ class TestData(object):
return self._get_path_to_file(file_type, "BlackboardDump.txt")
def get_sorted_errors_path(self, file_type):
"""Get the path to the SortedErrors file that correspodns to the given
"""Get the path to the SortedErrors file that corresponds to the given
DBType.
Args:
file_type: the DBType of the path to be generated
"""
return self._get_path_to_file(file_type, "BlackboardDumpErrors.txt")
return self._get_path_to_file(file_type, "SortedErrors.txt")
def get_db_dump_path(self, file_type):
"""Get the path to the DBDump file that corresponds to the given DBType.

10
test/script/tskdbdiff.py
View File

@@ -85,18 +85,18 @@ class TskDbDiff(object):
"""Set up the necessary files based on the arguments given at construction"""
if self.output_dir is None:
# No stored files
self._bb_dump = TskDbDiff._get_tmp_file("SortedData", ".txt")
self._bb_dump_diff = TskDbDiff._get_tmp_file("SortedData-Diff", ".txt")
self._bb_dump = TskDbDiff._get_tmp_file("BlackboardDump", ".txt")
self._bb_dump_diff = TskDbDiff._get_tmp_file("BlackboardDump-Diff", ".txt")
self._dump = TskDbDiff._get_tmp_file("DBDump", ".txt")
self._dump_diff = TskDbDiff._get_tmp_file("DBDump-Diff", ".txt")
else:
self._bb_dump = os.path.join(self.output_dir, "SortedData.txt")
self._bb_dump_diff = os.path.join(self.output_dir, "SortedData-Diff.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._dump = os.path.join(self.output_dir, "DBDump.txt")
self._dump_diff = os.path.join(self.output_dir, "DBDump-Diff.txt")
if self.gold_bb_dump is None:
self.gold_bb_dump = TskDbDiff._get_tmp_file("GoldSortedData", ".txt")
self.gold_bb_dump = TskDbDiff._get_tmp_file("GoldBlackboardDump", ".txt")
self.gold_dump = TskDbDiff._get_tmp_file("GoldDBDump", ".txt")