Changes in tests/test.py [35a408b7:f806b61]

File:

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

tests/test.py

@@ -202 +202 @@
                 if error :
                         text = text + '\n' + error
-
-                return retcode == TestResult.SUCCESS, text
+                        out = sys.stderr
+
+                print(text, file = out)
+                sys.stdout.flush()
+                sys.stderr.flush()
+
+                return retcode != TestResult.SUCCESS
         except KeyboardInterrupt:
-                return False, ""
-        except:
-                print("Unexpected error in worker thread", file=sys.stderr)
-                sys.stderr.flush()
-                return False, ""
-
+                False
 
 # run the given list of tests with the given parameters
@@ -220 +220 @@
         pool = multiprocessing.Pool(jobs)
 
-        failed = False
-
         # for each test to run
         try :
-                num = len(tests)
-                fancy = sys.stdout.isatty()
-                results = pool.imap_unordered(
+                results = pool.map_async(
                         run_test_worker,
                         tests,
                         chunksize = 1
-                )
-
-                for i, (succ, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
-                        if not succ :
-                                failed = True
-
-                        print("       " + txt)
-
-                        if(fancy and i != num):
-                                print("%d/%d" % (i, num), end='\r')
-                                sys.stdout.flush()
-
+                ).get(settings.timeout.total)
         except KeyboardInterrupt:
-                print("Tests interrupted by user", file=sys.stderr)
                 pool.terminate()
-                pool.join()
-                failed = True
-        except multiprocessing.TimeoutError:
-                print("ERROR: Test suite timed out", file=sys.stderr)
-                pool.terminate()
-                pool.join()
-                failed = True
-                killgroup() # needed to cleanly kill all children
-
+                print("Tests interrupted by user")
+                sys.exit(1)
 
         # clean the workspace
         make('clean', output=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
-        return 1 if failed else 0
+        for failed in results:
+                if failed :
+                        return 1
+
+        return 0