summaryrefslogtreecommitdiffhomepage
path: root/test.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-05 14:22:41 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-05 14:22:41 -0700
commit8ece9074003ddc785b72764783102325fe140a75 (patch)
treeb5c48f4bc51193abba2af82d49a5eb147f464562 /test.py
parent8455a8a2d2058d1daf55e9f8446a2b4a0676339e (diff)
parentb8022866fac62d1757aa730d5991030f223088fd (diff)
Merge branch 'master' into 335-int
Diffstat (limited to 'test.py')
-rwxr-xr-xtest.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/test.py b/test.py
index 2b3d4ed4..92a3e6d0 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)