fix(html): Fixed html index rendering bug introduced by recent change.

google · Sep 28, 2018 · 6848253 · 6848253
1 parent acf6400
commit 6848253
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git 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
@@ -406,15 +406,21 @@ 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
           end_timestamp = entry.get('_timestamp')
           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
@@ -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()