summaryrefslogtreecommitdiffhomepage
path: root/test.py
diff options
context:
space:
mode:
authorOlle Lundberg <geek@nerd.sh>2014-08-14 12:00:46 +0200
committerOlle Lundberg <geek@nerd.sh>2014-08-14 12:00:46 +0200
commita429e17e8e5cc3f5d442d374fb4843badfd4dd48 (patch)
tree1405561b6de5891b1a5ac8d6c4b7c65b7387d8b3 /test.py
parent991d56bad32c1ea4eda6c86771a4a4b7bef00475 (diff)
Join the threads with a low timeout.
Instead of using private methods on the threading class, let the thread join, but with a low timeout.
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)