diff --git a/plaso/cli/status_view.py b/plaso/cli/status_view.py index 34e6665792..e26d6772ca 100644 --- a/plaso/cli/status_view.py +++ b/plaso/cli/status_view.py @@ -237,7 +237,7 @@ def _PrintAnalysisStatusHeader(self, processing_status): f'Storage file\t\t: {self._storage_file_path:s}\n') processing_time = self._FormatProcessingTime(processing_status) - self._output_writer.Write(f'Processing time\t: {processing_time:s}\n') + self._output_writer.Write(f'Processing time\t\t: {processing_time:s}\n') if processing_status and processing_status.events_status: self._PrintEventsStatus(processing_status.events_status) @@ -525,7 +525,7 @@ def PrintExtractionStatusHeader(self, processing_status): self._output_writer.Write(f'Filter file\t\t: {self._filter_file:s}\n') processing_time = self._FormatProcessingTime(processing_status) - self._output_writer.Write(f'Processing time\t: {processing_time:s}\n') + self._output_writer.Write(f'Processing time\t\t: {processing_time:s}\n') self._PrintTasksStatus(processing_status) self._output_writer.Write('\n') diff --git a/tests/cli/log2timeline_tool.py b/tests/cli/log2timeline_tool.py index 40ca144912..06e095bfdd 100644 --- a/tests/cli/log2timeline_tool.py +++ b/tests/cli/log2timeline_tool.py @@ -37,7 +37,7 @@ def _CheckOutput(self, output, expected_output): output = output.split('\n') self.assertEqual(output[:3], expected_output[:3]) - self.assertTrue(output[3].startswith('Processing time\t: ')) + self.assertTrue(output[3].startswith('Processing time\t\t: ')) self.assertEqual(output[4:], expected_output[4:]) def _CreateExtractionOptions(self, source_path, password=None): @@ -191,7 +191,7 @@ def testExtractEventsFromSourcesOnDirectory(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: directory', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -224,7 +224,7 @@ def testExtractEventsFromSourcesOnAPFSImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -258,7 +258,7 @@ def testExtractEventsFromSourcesOnBDEImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -291,7 +291,7 @@ def testExtractEventsFromSourcesOnCompressedDMGImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -324,7 +324,7 @@ def testExtractEventsFromSourcesImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -359,7 +359,7 @@ def testExtractEventsFromSourcesPartitionedImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -394,7 +394,7 @@ def testExtractEventsFromSourcesOnVSSImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -431,7 +431,7 @@ def testExtractEventsFromSourcesOnFile(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: single file', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -468,7 +468,7 @@ def testExtractEventsFromSourcesOnLinkToDirectory(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: directory', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -503,7 +503,7 @@ def testExtractEventsFromSourcesOnLinkToFile(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: single file', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', diff --git a/tests/cli/psteal_tool.py b/tests/cli/psteal_tool.py index 1c81978c02..b77d3d9eb7 100644 --- a/tests/cli/psteal_tool.py +++ b/tests/cli/psteal_tool.py @@ -33,7 +33,7 @@ def _CheckOutput(self, output, expected_output): output = output.split('\n') self.assertEqual(output[:3], expected_output[:3]) - self.assertTrue(output[3].startswith('Processing time\t: ')) + self.assertTrue(output[3].startswith('Processing time\t\t: ')) self.assertEqual(output[4:], expected_output[4:]) def testFailWhenOutputAlreadyExists(self): @@ -163,7 +163,7 @@ def testExtractEventsFromSourceDirectory(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: directory', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -207,7 +207,7 @@ def testExtractEventsFromSourceBDEImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -248,7 +248,7 @@ def testExtractEventsFromSourcesImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -291,7 +291,7 @@ def testExtractEventsFromSourcePartitionedImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -335,7 +335,7 @@ def testExtractEventsFromSourceVSSImage(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: storage media image', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', @@ -380,7 +380,7 @@ def testExtractEventsFromSourceSingleFile(self): '', 'Source path\t\t: {0:s}'.format(options.source), 'Source type\t\t: single file', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', 'Processing started.', 'Processing completed.', diff --git a/tests/cli/status_view.py b/tests/cli/status_view.py index 2f0a55f9dc..170c1c9ecc 100644 --- a/tests/cli/status_view.py +++ b/tests/cli/status_view.py @@ -54,7 +54,7 @@ def _CheckOutput(self, output, expected_output): output = output.split('\n') self.assertEqual(output[:4], expected_output[:4]) - self.assertTrue(output[4].startswith('Processing time\t: ')) + self.assertTrue(output[4].startswith('Processing time\t\t: ')) self.assertEqual(output[5:], expected_output[5:]) # TODO: add tests for _ClearScreen @@ -136,7 +136,7 @@ def testPrintExtractionStatusUpdateWindow(self): '', 'Source path\t\t: /test/source/path', 'Source type\t\t: directory', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', table_header, ('f_identifier ' @@ -174,7 +174,7 @@ def testPrintExtractionStatusUpdateWindow(self): '', 'Source path\t\t: /test/source/path', 'Source type\t\t: directory', - 'Processing time\t: 00:00:00', + 'Processing time\t\t: 00:00:00', '', table_header, ('f_identifier '