From 389504fa8d1b30320a0e22855a69bbce8a577061 Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Mon, 9 Dec 2019 15:45:05 +0100
Subject: [PATCH] changed time tracker representation to hh:mm:ss
---
src/helpers.py | 4 +++-
test/test_helpers.py | 2 +-
test/test_modules/test_run_environment.py | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/helpers.py b/src/helpers.py
index 1b635a2e..d73a39e1 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 7de58f33..f5b41c5d 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 ce5f995e..1eeaa02c 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)
--
GitLab