Merge pull request #979 from habibayassin/genElapsed-issue

util: fix hours and mins mixup

Author: maliberty

flow/util/genElapsedTime.py

@@ -7,6 +7,7 @@
 import pathlib
 import os
 import argparse  # argument parsing
+import sys
 
 # Parse and validate arguments
 # ==============================================================================
@@ -18,7 +19,7 @@
 
 if not args.logDir:
     print('[ERROR] Please add a logDir'
-          '-d/--logDir.')
+          '-d/--logDir.', file=sys.stderr)
     parser.print_help()
     sys.exit(1)
 
@@ -36,8 +37,15 @@
             # Ensure that hours, min and seconds are separated by ':' not '.'
             timePor = timePor.replace('.',':')
             # Calculate elapsed time that has this format 'h:m:s'
-            timeList = timePor.split(':', 2)
-            elapsedTime = int(timeList[0])*3600 + int(timeList[1])*60 + int(timeList[2])
+            timeList = timePor.split(':')
+            if len(timeList) == 2:
+                # Only minutes and seconds are present
+                elapsedTime = int(timeList[0])*60 + int(timeList[1])
+            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:
+        print('No elapsed time found in',  str(f), file=sys.stderr)
 
     # Print the name of the step and the corresponding elapsed time
     print('%-25s %10s' % (os.path.splitext(os.path.basename(str(f)))[0], elapsedTime))

flow/util/test_genElapsedTime.py

@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+
+import unittest
+from unittest.mock import patch
+from unittest.mock import MagicMock
+from io import StringIO
+import io
+import sys
+import os
+import tempfile
+from datetime import datetime
+import argparse  # argument parsing
+from pathlib import Path
+
+# make sure the working dir is flow/
+os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)) , '..'))
+
+class TestElapsedTime(unittest.TestCase):
+
+    def setUp(self):
+        self.tmp_dir = tempfile.TemporaryDirectory()
+        self.log_file = os.path.join(self.tmp_dir.name, "1_test.log")
+
+    @patch("sys.stdout", new_callable=StringIO)
+    def test_elapsed_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: 01:30:00[h:]min:sec.\n")
+        # call the script with the test log file
+        sys.argv = ["util/genElapsedTime.py", "--logDir", str(self.tmp_dir.name)]
+        with patch.object(sys, 'argv', sys.argv):
+                import genElapsedTime
+        # check if output is correct
+        expected_output = "1_test                          5400\n"
+        self.assertEqual(mock_stdout.getvalue(), expected_output)
+
+    @patch("sys.stdout", new_callable=StringIO)
+    def test_longer_elapsed_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: 12:24.14[h:]min:sec. CPU time: user 5081.82 sys 170.18 (705%). Peak memory: 9667132KB.\n")
+        # call the script with the test log file
+        sys.argv = ["util/genElapsedTime.py", "--logDir", str(self.tmp_dir.name)]
+        with patch.object(sys, 'argv', sys.argv):
+                import genElapsedTime
+        # check if output is correct
+        expected_output = "1_test                         44654\n"
+        self.assertEqual(mock_stdout.getvalue(), expected_output)
+
+    def test_missing_arg(self):
+        with self.assertRaises(SystemExit):
+            with patch('sys.stderr', new=StringIO()) as fake_err_output:
+                with patch('sys.argv', ["util/genElapsedTime.py"]):
+                    import genElapsedTime
+            self.assertIn('--logDir', fake_err_output.getvalue())
+
+
+    def test_no_elapsed_time(self):
+        with open(self.log_file, "w") as f:
+            f.write('Other log message')
+        with patch('sys.argv', ["util/genElapsedTime.py", "--logDir", str(self.tmp_dir.name)]):
+                with patch('sys.stderr', new=StringIO()) as fake_err_output:
+                    import genElapsedTime
+                self.assertIn('No elapsed time found in', fake_err_output.getvalue())
+
+    def tearDown(self):
+       self.tmp_dir.cleanup()
+
+if __name__ == '__main__':
+    unittest.main()