Mercurial > hg-stable

changeset 27933:a6833e464b07 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: "fix" race condition in race condition fix Laurent's commit 3203dfe341f9 still suffers from a race: by the time the "job" function tries to assign to channels[channel], that list has been truncated to empty. The result is that every job thread raises an IndexError. Earlier, I tried an approach of correctly locking channels, but that caused run-tests to hang on KeyboardInterrupt sometimes. This approach is strictly hackier, but seems to actually work reliably.
author Bryan O'Sullivan <bryano@fb.com>
date Fri, 22 Jan 2016 11:00:13 -0800
parents 6bc2299cc12f
children 1779ff7426c9
files tests/run-tests.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Fri Jan 22 20:32:47 2016 +0000
+++ b/tests/run-tests.py	Fri Jan 22 11:00:13 2016 -0800
@@ -1526,13 +1526,16 @@
             channels[channel] = "=" + test.name[5:].split(".")[0]
             try:
                 test(result)
-                channels[channel] = ''
                 done.put(None)
             except KeyboardInterrupt:
-                channels[channel] = ''
+                pass
             except: # re-raises
                 done.put(('!', test, 'run-test raised an error, see traceback'))
                 raise
+            try:
+                channels[channel] = ''
+            except IndexError:
+                pass
 
         def stat():
             count = 0