summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-11-02 17:43:03 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-11-02 17:43:03 -0800
commit24e767792dab6e4cac6e5374032e772951d0392e (patch)
tree294408a2af278722906cefd541b9523152b5f32c
parent583d6eaedfe2b004777b100ab8a8185bb9bec073 (diff)
Backport a Python 3.4+ threading change to test.py
-rwxr-xr-xtest.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/test.py b/test.py
index bd966d1e..6a2c9a8b 100755
--- a/test.py
+++ b/test.py
@@ -149,10 +149,7 @@ def main():
# TODO: make that not a problem, jeez
for thread in threading.enumerate():
if thread is not threading.currentThread():
- if PY2:
- thread._Thread__stop()
- else:
- thread._stop()
+ thread.join(timeout=1)
# Exit correctly
if not result.wasSuccessful():
sys.exit(1)