Changes in tests/test.py [172a88d:1f3d212]

File:

• tests/test.py (modified) (6 diffs)

tests/test.py

@@ -257 +257 @@
 
                 # update output based on current action
-                result_key, result_txt = TestResult.toString( retcode, duration )
+                result_txt = TestResult.toString( retcode, duration )
 
                 #print result with error if needed
@@ -265 +265 @@
                         text = text + '\n' + error
 
-                return retcode == TestResult.SUCCESS, result_key, text
+                return retcode == TestResult.SUCCESS, text
         except KeyboardInterrupt:
-                return False, 'keybrd', ""
+                return False, ""
         # except Exception as ex:
         #       print("Unexpected error in worker thread running {}: {}".format(t.target(), ex), file=sys.stderr)
@@ -283 +283 @@
 
         failed = False
-        rescnts = {     'pass': 0, 'fail': 0, 'time': 0, 'keybrd': 0 }
-        other = 0
 
         # for each test to run
@@ -296 +294 @@
                 )
 
-                for i, (succ, code, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
-                        if code in rescnts.keys():
-                                rescnts[code] += 1
-                        else:
-                                other += 1
-
+                for i, (succ, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
                         if not succ :
                                 failed = True
@@ -326 +319 @@
         # clean the workspace
         make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
-
-        print("{} passes, {} failures, {} timeouts, {} cancelled, {} other".format(rescnts['pass'], rescnts['fail'], rescnts['time'], rescnts['keybrd'], other))
 
         return failed
@@ -452 +443 @@
                         failed = run_tests(local_tests, options.jobs)
                         if failed:
+                                result = 1
                                 if not settings.continue_:
                                         break