From 9bfe728cfeddaac815b0aaa30d1b432d51842560 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 8 Sep 2021 16:30:10 -0700 Subject: [PATCH] better human times fixes #420 --- lib/commons/rscommons/util.py | 2 +- lib/commons/test/test_util.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/commons/rscommons/util.py b/lib/commons/rscommons/util.py index d6e61dac..2345ab7a 100644 --- a/lib/commons/rscommons/util.py +++ b/lib/commons/rscommons/util.py @@ -235,7 +235,7 @@ def pretty_duration(time_s=False): """ if not time_s >= 0: return '???' - seconds = time_s % 60 + seconds = floor(time_s % 60) minutes = floor(time_s / 60) % 60 hours = floor(time_s / 3600) % 24 if time_s < 60: diff --git a/lib/commons/test/test_util.py b/lib/commons/test/test_util.py index 30fca9be..9214ef72 100644 --- a/lib/commons/test/test_util.py +++ b/lib/commons/test/test_util.py @@ -25,6 +25,9 @@ def test_pretty_duration(self): test1 = util.pretty_duration(100) self.assertEqual(test1, '1:40 minutes') + test1 = util.pretty_duration(103.234234) + self.assertEqual(test1, '1:43 minutes') + test1 = util.pretty_duration(1000) self.assertEqual(test1, '16:40 minutes')