Changes in / [c7d8100c:4358c1e]

Location:

src/tests

Files:

• pybin/test_run.py (modified) (2 diffs)
• test.py (modified) (5 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
@@ -69 +57 @@
 
         @classmethod
-        def toString( cls, retcode, duration ):
+        def toString( cls, retcode ):
                 if settings.generating :
-                        if   retcode == TestResult.SUCCESS:     text = "Done   "
-                        elif retcode == TestResult.TIMEOUT:     text = "TIMEOUT"
-                        else :                                          text = "ERROR code %d" % retcode
+                        if   retcode == TestResult.SUCCESS:     return "Done"
+                        elif retcode == TestResult.TIMEOUT:     return "TIMEOUT"
+                        else :                                          return "ERROR code %d" % retcode
                 else :
-                        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"
+                        if   retcode == TestResult.SUCCESS:     return "PASSED"
+                        elif retcode == TestResult.TIMEOUT:     return "TIMEOUT"
+                        else :                                          return "FAILED with code %d" % retcode

src/tests/test.py

@@ -9 +9 @@
 import re
 import sys
-import time
 
 ################################################################################
@@ -137 +136 @@
 
         # build, skipping to next test on error
-        before = time.time()
         make_ret, _ = make( test.target(),
                 redirects  = "2> %s 1> /dev/null" % out_file,
                 error_file = err_file
         )
-        after = time.time()
-
-        comp_dur = after - before
-
-        run_dur = None
 
         # if the make command succeds continue otherwise skip to diff
         if make_ret == 0 or settings.dry_run:
-                before = time.time()
                 if settings.dry_run or fileIsExecutable(test.target()) :
                         # run test
@@ -157 +149 @@
                         # simply cat the result into the output
                         retcode, _ = sh("cat %s > %s" % (test.target(), out_file))
-
-                after = time.time()
-                run_dur = after - before
         else:
                 retcode, _ = sh("mv %s %s" % (err_file, out_file))
@@ -185 +174 @@
         sh("rm -f %s > /dev/null 2>&1" % test.target())
 
-        return retcode, error, [comp_dur, run_dur]
+        return retcode, error
 
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
@@ -194 +183 @@
                 name_txt = "%20s  " % t.name
 
-                retcode, error, duration = run_single_test(t)
+                retcode, error = run_single_test(t)
 
                 # update output based on current action
-                result_txt = TestResult.toString( retcode, duration )
+                result_txt = TestResult.toString( retcode )
 
                 #print result with error if needed