Changeset 35a408b7

Timestamp:

Jun 26, 2019, 1:51:28 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b0ab7853, e507c11

Parents:

05c34c3

Message:

Fixed global timeout

Location:

tests

Files:

• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (3 diffs)

tests/pybin/tools.py

@@ -179 +179 @@
                         os.chdir(cwd)
 
+def killgroup():
+        try:
+                os.killpg(os.getpgrp(), signal.SIGINT)
+        except KeyboardInterrupt:
+                pass # expected
+        except Exception as exc:
+                print("Unexpected exception", file=sys.stderr)
+                print(exc, file=sys.stderr)
+                sys.stderr.flush()
+                sys.exit(2)
+
 ################################################################################
 #               file handling
@@ -301 +312 @@
         self.end = time.time()
         self.duration = self.end - self.start
+
+def timed(src, timeout):
+        expire = time.time() + timeout
+        i = iter(src)
+        while True:
+                yield i.next(max(expire - time.time(), 0))

tests/test.py

@@ -205 +205 @@
                 return retcode == TestResult.SUCCESS, text
         except KeyboardInterrupt:
-                False, ""
+                return False, ""
+        except:
+                print("Unexpected error in worker thread", file=sys.stderr)
+                sys.stderr.flush()
+                return False, ""
+
 
 # run the given list of tests with the given parameters
@@ -221 +226 @@
                 num = len(tests)
                 fancy = sys.stdout.isatty()
-                for i, (succ, txt) in enumerate(pool.imap(
+                results = pool.imap_unordered(
                         run_test_worker,
                         tests,
                         chunksize = 1
-                )) :
+                )
+
+                for i, (succ, txt) in enumerate(timed(results, timeout = settings.timeout.total), 1) :
                         if not succ :
                                 failed = True
@@ -236 +243 @@
 
         except KeyboardInterrupt:
+                print("Tests interrupted by user", file=sys.stderr)
                 pool.terminate()
-                print("Tests interrupted by user", file=sys.stderr)
+                pool.join()
                 failed = True
         except multiprocessing.TimeoutError:
+                print("ERROR: Test suite timed out", file=sys.stderr)
                 pool.terminate()
-                print("ERROR: Test suite timed out", file=sys.stderr)
+                pool.join()
                 failed = True
+                killgroup() # needed to cleanly kill all children
+
 
         # clean the workspace