diff --git a/citest/reporting/html_index_renderer.py b/citest/reporting/html_index_renderer.py index 136a371..2e4ed14 100644 --- a/citest/reporting/html_index_renderer.py +++ b/citest/reporting/html_index_renderer.py @@ -121,7 +121,11 @@ def __handle_generic(self, entry): self.__depth -= 1 if self.__depth == 0: relation = entry.get('relation') - self.__increment_relation_count(relation) + if self.__in_test: + self.__increment_relation_count(relation) + elif relation is not None: + self.__summary_status = self.__ingest_summary_status( + self.__summary_status, relation) return @property diff --git a/citest/reporting/html_index_table_renderer.py b/citest/reporting/html_index_table_renderer.py index e709055..2cda7e2 100644 --- a/citest/reporting/html_index_table_renderer.py +++ b/citest/reporting/html_index_table_renderer.py @@ -406,7 +406,14 @@ def __handle_generic(self, entry): if entry.get('control') == 'END': # pylint: disable=bad-indentation self.__depth -= 1 - if self.__depth == 0 and self.__in_test: + if self.__depth == 0: + relation = entry.get('relation') + if not self.__in_test: + if relation is not None: + self.__summary_status = self.__ingest_summary_status( + self.__summary_status, relation) + return + passed = 0 failed = 0 error = 0 @@ -414,7 +421,6 @@ def __handle_generic(self, entry): secs = (end_timestamp - self.__start_timestamp if end_timestamp and self.__start_timestamp else 0) - relation = entry.get('relation') self.__summary_status = self.__ingest_summary_status( self.__summary_status, relation) diff --git a/citest/reporting/journal_cli.py b/citest/reporting/journal_cli.py index b8c68b5..b0a48b0 100644 --- a/citest/reporting/journal_cli.py +++ b/citest/reporting/journal_cli.py @@ -28,7 +28,7 @@ import json import sys -from citest.base import Journal +from citest.base import Journal, StreamJournalNavigator from citest.reporting import DumpRenderer @@ -243,8 +243,9 @@ def init_argument_parser(self, argparser): def __call__(self, options): """Process command.""" + navigator = StreamJournalNavigator.new_from_path(options.path) processor = DumpRenderer(vars(options)) - processor.process(options.path) + processor.process(navigator) processor.terminate()