From 385f86fdf4fd3d6783ef1f1bb3f7a0bd3ee146fc Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Mon, 30 Mar 2015 16:25:53 -0400 Subject: [PATCH 1/3] fixed naming consistency - BlackboardDumpErrors instead of SortedErrors --- test/script/regression.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/script/regression.py b/test/script/regression.py index 77d2061f2f..a7ebc7ade5 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -345,7 +345,7 @@ class TestRunner(object): if file_exists(test_data.get_sorted_data_path(DBType.OUTPUT)): shutil.copy(test_data.get_sorted_data_path(DBType.OUTPUT), dataoutpth) shutil.copy(dbdumpinpth, dbdumpoutpth) - error_pth = make_path(tmpdir, test_data.image_name+"SortedErrors.txt") + error_pth = make_path(tmpdir, test_data.image_name+"BlackboardDumpErrors.txt") shutil.copy(test_data.sorted_log, error_pth) except IOError as e: Errors.print_error(str(e)) @@ -451,7 +451,7 @@ class TestData(object): antlog_dir: a pathto_File, the antlog.txt file test_dbdump: a pathto_File, the database dump, IMAGENAMEDump.txt common_log_path: a pathto_File, the IMAGE_NAMECOMMON_LOG file - sorted_log: a pathto_File, the IMAGENAMESortedErrors.txt file + sorted_log: a pathto_File, the IMAGENAMEBlackboardDumpErrors.txt file reports_dir: a pathto_Dir, the AutopsyTestCase/Reports folder gold_data_dir: a pathto_Dir, the gold standard directory gold_archive: a pathto_File, the gold standard archive @@ -500,7 +500,7 @@ class TestData(object): self.test_dbdump = make_path(self.output_path, self.image_name + "DBDump.txt") self.common_log_path = make_local_path(self.output_path, self.image_name + COMMON_LOG) - self.sorted_log = make_local_path(self.output_path, self.image_name + "SortedErrors.txt") + self.sorted_log = make_local_path(self.output_path, self.image_name + "BlackboardDumpErrors.txt") self.reports_dir = make_path(self.output_path, AUTOPSY_TEST_CASE, "Reports") self.gold_data_dir = make_path(self.main_config.img_gold, self.image_name) self.gold_archive = make_path(self.main_config.gold, @@ -579,7 +579,7 @@ 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 BlackboardDumpErrors file that correspodns to the given DBType. Args: From 1372de9f732abb3fb02f4898b14172724357940d Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Mon, 30 Mar 2015 18:00:42 -0400 Subject: [PATCH 2/3] Reverted BlackboardDumpErrors to SortedErrors. Used newer naming conv in Tskdbdiff.py --- test/script/regression.py | 14 +++++++------- test/script/tskdbdiff.py | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/script/regression.py b/test/script/regression.py index a7ebc7ade5..08938f371b 100755 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -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): @@ -345,7 +345,7 @@ class TestRunner(object): if file_exists(test_data.get_sorted_data_path(DBType.OUTPUT)): shutil.copy(test_data.get_sorted_data_path(DBType.OUTPUT), dataoutpth) shutil.copy(dbdumpinpth, dbdumpoutpth) - error_pth = make_path(tmpdir, test_data.image_name+"BlackboardDumpErrors.txt") + error_pth = make_path(tmpdir, test_data.image_name+"SortedErrors.txt") shutil.copy(test_data.sorted_log, error_pth) except IOError as e: Errors.print_error(str(e)) @@ -451,7 +451,7 @@ class TestData(object): antlog_dir: a pathto_File, the antlog.txt file test_dbdump: a pathto_File, the database dump, IMAGENAMEDump.txt common_log_path: a pathto_File, the IMAGE_NAMECOMMON_LOG file - sorted_log: a pathto_File, the IMAGENAMEBlackboardDumpErrors.txt file + sorted_log: a pathto_File, the IMAGENAMESortedErrors.txt file reports_dir: a pathto_Dir, the AutopsyTestCase/Reports folder gold_data_dir: a pathto_Dir, the gold standard directory gold_archive: a pathto_File, the gold standard archive @@ -500,7 +500,7 @@ class TestData(object): self.test_dbdump = make_path(self.output_path, self.image_name + "DBDump.txt") self.common_log_path = make_local_path(self.output_path, self.image_name + COMMON_LOG) - self.sorted_log = make_local_path(self.output_path, self.image_name + "BlackboardDumpErrors.txt") + self.sorted_log = make_local_path(self.output_path, self.image_name + "SortedErrors.txt") self.reports_dir = make_path(self.output_path, AUTOPSY_TEST_CASE, "Reports") self.gold_data_dir = make_path(self.main_config.img_gold, self.image_name) self.gold_archive = make_path(self.main_config.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 BlackboardDumpErrors 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. diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py index e5a2ec2dc0..a8dd48a84f 100755 --- a/test/script/tskdbdiff.py +++ b/test/script/tskdbdiff.py @@ -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", ".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") From 41b96b7d27abcb778c1358eaa46c7aafe79980de Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Tue, 31 Mar 2015 10:14:31 -0400 Subject: [PATCH 3/3] extra .txt extention removed --- 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 a8dd48a84f..d9824297c0 100755 --- a/test/script/tskdbdiff.py +++ b/test/script/tskdbdiff.py @@ -85,7 +85,7 @@ 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("BlackboardDump.txt", ".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")