Changeset ff29f08 for src/tests/pybin

Timestamp:

May 18, 2018, 2:09:21 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

• src/tests/pybin/test_run.py (modified) (2 diffs)

src/tests/pybin/test_run.py

@@ -4 +4 @@
 
 import pybin.settings
+import datetime
+
+from string import Template
+
+class DeltaTemplate(Template):
+    delimiter = "%"
+
+def strfdelta(tdelta, fmt):
+    d["H"], rem = divmod(tdelta.seconds, 3600)
+    d["M"], d["S"] = divmod(rem, 60)
+    t = DeltaTemplate(fmt)
+    return t.substitute(**d)
 
 # Test class that defines what a test is
@@ -57 +69 @@
 
         @classmethod
-        def toString( cls, retcode ):
+        def toString( cls, retcode, duration ):
                 if settings.generating :
-                        if   retcode == TestResult.SUCCESS:     return "Done"
-                        elif retcode == TestResult.TIMEOUT:     return "TIMEOUT"
-                        else :                                          return "ERROR code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     text = "Done   "
+                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
+                        else :                                          text = "ERROR code %d" % retcode
                 else :
-                        if   retcode == TestResult.SUCCESS:     return "PASSED"
-                        elif retcode == TestResult.TIMEOUT:     return "TIMEOUT"
-                        else :                                          return "FAILED with code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     text = "PASSED "
+                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
+                        else :                                          text = "FAILED with code %d" % retcode
+
+                text += "    C%s - R%s" % (cls.fmtDur(duration[0]), cls.fmtDur(duration[1]))
+                return text
+
+        @classmethod
+        def fmtDur( cls, duration ):
+                if duration :
+                        hours, rem = divmod(duration, 3600)
+                        minutes, rem = divmod(rem, 60)
+                        seconds, millis = divmod(rem, 1)
+                        return "%2d:%02d.%03d" % (minutes, seconds, millis * 1000)
+                return " n/a"