diff --git a/src/helpers.py b/src/helpers.py index 1b635a2e9cd00bfbb3650a5a7a8768378cfcdb6b..d73a39e15d43d25f7be717f11fe7f67260f07ac0 100644 --- a/src/helpers.py +++ b/src/helpers.py @@ -13,6 +13,7 @@ import numpy as np import os import time import socket +import datetime as dt def to_list(arg): @@ -116,7 +117,8 @@ class TimeTracking(object): return time.time() - self.start def __repr__(self): - return f"{round(self._duration(), 2)}s" + # return f"{round(self._duration(), 2)}s" + return f"{dt.timedelta(seconds=math.ceil(self._duration()))} (hh:mm:ss)" def run(self): self._start() diff --git a/test/test_helpers.py b/test/test_helpers.py index 7de58f331ea4b6eeaf46b6d8b10f8ad1da487f3c..f5b41c5da8fa7b5297910e54bf36e2eb09be080c 100644 --- a/test/test_helpers.py +++ b/test/test_helpers.py @@ -117,7 +117,7 @@ class TestTimeTracking: t = TimeTracking() t._end() duration = t._duration() - assert t.__repr__().rstrip() == f"{round(duration, 2)}s".rstrip() + assert t.__repr__().rstrip() == f"{dt.timedelta(seconds=math.ceil(duration))} (hh:mm:ss)".rstrip() def test_run(self): t = TimeTracking(start=False) diff --git a/test/test_modules/test_run_environment.py b/test/test_modules/test_run_environment.py index ce5f995e54df1ffc93c80c191376347c5f0b3741..1eeaa02c530d05e1ceee7bde8811db53ad6042aa 100644 --- a/test/test_modules/test_run_environment.py +++ b/test/test_modules/test_run_environment.py @@ -16,7 +16,8 @@ class TestRunEnvironment: caplog.set_level(logging.INFO) with RunEnvironment() as r: r.do_stuff(0.1) - assert caplog.record_tuples[-1] == ('root', 20, PyTestRegex(r"RunEnvironment finished after \d+\.\d+s")) + expression = PyTestRegex(r"RunEnvironment finished after \d+:\d+:\d+ \(hh:mm:ss\)") + assert caplog.record_tuples[-1] == ('root', 20, expression) def test_init(self, caplog): caplog.set_level(logging.INFO) @@ -28,4 +29,5 @@ class TestRunEnvironment: r = RunEnvironment() r.do_stuff(0.2) del r - assert caplog.record_tuples[-1] == ('root', 20, PyTestRegex(r"RunEnvironment finished after \d+\.\d+s")) + expression = PyTestRegex(r"RunEnvironment finished after \d+:\d+:\d+ \(hh:mm:ss\)") + assert caplog.record_tuples[-1] == ('root', 20, expression)