Use correct singluar/plural forms in time2str

Author: Flamefire

easybuild/tools/utilities.py

@@ -300,22 +300,21 @@ def time2str(delta):
     if not isinstance(delta, datetime.timedelta):
         raise EasyBuildError("Incorrect value type provided to time2str, should be datetime.timedelta: %s", type(delta))
 
-    delta_secs = delta.days * 3600 * 24 + delta.seconds + delta.microseconds / 10**6
-
-    if delta_secs < 60:
-        res = '%d sec' % int(delta_secs)
-    elif delta_secs < 3600:
-        mins = int(delta_secs / 60)
-        secs = int(delta_secs - (mins * 60))
-        res = '%d min %d sec' % (mins, secs)
-    else:
-        hours = int(delta_secs / 3600)
-        mins = int((delta_secs - hours * 3600) / 60)
-        secs = int(delta_secs - (hours * 3600) - (mins * 60))
-        hours_str = 'hours' if hours > 1 else 'hour'
-        res = '%d %s %d min %d sec' % (hours, hours_str, mins, secs)
+    delta_secs = delta.total_seconds()
 
-    return res
+    hours = int(delta_secs / 3600)
+    delta_secs -= hours * 3600
+    mins = int(delta_secs / 60)
+    secs = int(delta_secs - mins * 60)
+
+    res = []
+    if hours:
+        res.append('%d %s' % (hours, 'hour' if hours == 1 else 'hours'))
+    if mins or hours:
+        res.append('%d %s' % (mins, 'min' if mins == 1 else 'mins'))
+    res.append('%d %s' % (secs, 'sec' if secs == 1 else 'secs'))
+
+    return ' '.join(res)
 
 
 def natural_keys(key):

test/framework/utilities_test.py

@@ -57,21 +57,23 @@ def test_time2str(self):
         start = datetime(2019, 7, 30, 5, 14, 23)
 
         test_cases = [
-            (start, "0 sec"),
-            (datetime(2019, 7, 30, 5, 14, 37), "14 sec"),
-            (datetime(2019, 7, 30, 5, 15, 22), "59 sec"),
-            (datetime(2019, 7, 30, 5, 15, 23), "1 min 0 sec"),
-            (datetime(2019, 7, 30, 5, 16, 22), "1 min 59 sec"),
-            (datetime(2019, 7, 30, 5, 37, 26), "23 min 3 sec"),
-            (datetime(2019, 7, 30, 6, 14, 22), "59 min 59 sec"),
-            (datetime(2019, 7, 30, 6, 14, 23), "1 hour 0 min 0 sec"),
-            (datetime(2019, 7, 30, 6, 49, 14), "1 hour 34 min 51 sec"),
-            (datetime(2019, 7, 30, 7, 14, 23), "2 hours 0 min 0 sec"),
-            (datetime(2019, 7, 30, 8, 35, 59), "3 hours 21 min 36 sec"),
-            (datetime(2019, 7, 30, 16, 29, 24), "11 hours 15 min 1 sec"),
-            (datetime(2019, 7, 31, 5, 14, 22), "23 hours 59 min 59 sec"),
-            (datetime(2019, 7, 31, 5, 14, 23), "24 hours 0 min 0 sec"),
-            (datetime(2019, 8, 5, 20, 39, 44), "159 hours 25 min 21 sec"),
+            (start, "0 secs"),
+            (datetime(2019, 7, 30, 5, 14, 37), "14 secs"),
+            (datetime(2019, 7, 30, 5, 15, 22), "59 secs"),
+            (datetime(2019, 7, 30, 5, 15, 23), "1 min 0 secs"),
+            (datetime(2019, 7, 30, 5, 16, 22), "1 min 59 secs"),
+            (datetime(2019, 7, 30, 5, 16, 24), "2 mins 1 sec"),
+            (datetime(2019, 7, 30, 5, 37, 26), "23 mins 3 secs"),
+            (datetime(2019, 7, 30, 6, 14, 22), "59 mins 59 secs"),
+            (datetime(2019, 7, 30, 6, 14, 23), "1 hour 0 mins 0 secs"),
+            (datetime(2019, 7, 30, 6, 49, 14), "1 hour 34 mins 51 secs"),
+            (datetime(2019, 7, 30, 7, 14, 23), "2 hours 0 mins 0 secs"),
+            (datetime(2019, 7, 30, 8, 35, 59), "3 hours 21 mins 36 secs"),
+            (datetime(2019, 7, 30, 16, 29, 24), "11 hours 15 mins 1 sec"),
+            (datetime(2019, 7, 31, 5, 14, 22), "23 hours 59 mins 59 secs"),
+            (datetime(2019, 7, 31, 5, 14, 23), "24 hours 0 mins 0 secs"),
+            (datetime(2019, 7, 31, 5, 15, 24), "24 hours 1 min 1 sec"),
+            (datetime(2019, 8, 5, 20, 39, 44), "159 hours 25 mins 21 secs"),
         ]
         for end, expected in test_cases:
             self.assertEqual(time2str(end - start), expected)