Handle zero elapsed time in genElapsedTime.py

Sub one second time rounds down to zero

Fixes #1043

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

flow/test/test_genElapsedTime.py

@@ -33,6 +33,19 @@ def test_elapsed_time(self, mock_stdout):
         expected_output = "1_test                          5400\n"
         self.assertEqual(mock_stdout.getvalue(), expected_output)
 
+    @patch("sys.stdout", new_callable=StringIO)
+    def test_zero_time(self, mock_stdout):
+        # create a log file with elapsed time
+        with open(self.log_file, "w") as f:
+            f.write("Some log entry\n")
+            f.write("Elapsed time: 00:00:74[h:]min:sec.\n")
+        # call the script with the test log file
+        sys.argv = ["./genElapsedTime.py", "--logDir", str(self.tmp_dir.name)]
+        with patch.object(sys, 'argv', sys.argv):
+            module = importlib.import_module(self.module_name)
+        # check if output is correct
+        self.assertEqual(mock_stdout.getvalue(), "")
+
     @patch("sys.stdout", new_callable=StringIO)
     def test_elapsed_time_longer_duration(self, mock_stdout):
         # create a log file with elapsed time

flow/util/genElapsedTime.py

@@ -23,6 +23,8 @@
     parser.print_help()
     sys.exit(1)
 
+found = False
+
 # Loop on all log files in the directory
 for f in sorted(pathlib.Path(args.logDir).glob('**/[0-9]_*.log')):
     # Extract Elapsed Time line from log file
@@ -31,6 +33,7 @@
             elapsedTime = 0
 
             if 'Elapsed time' in line:
+                found = True
                 # Extract the portion that has the time
                 timePor = line.strip().replace('Elapsed time: ', '')
                 # Remove the units from the time portion
@@ -45,11 +48,12 @@
                 elif len(timeList) == 3:
                     # Hours, minutes, and seconds are present
                     elapsedTime = int(timeList[0])*3600 + int(timeList[1])*60 + int(timeList[2])
-        if elapsedTime == 0:
+                else:
+                    print('Elapsed time not understood in',  str(line), file=sys.stderr)
+
+        if not found:
             print('No elapsed time found in',  str(f), file=sys.stderr)
 
     # Print the name of the step and the corresponding elapsed time
     if elapsedTime != 0:
         print('%-25s %10s' % (os.path.splitext(os.path.basename(str(f)))[0], elapsedTime))
-
-