summaryrefslogtreecommitdiff
path: root/src/testdir/test_channel.py
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-20 18:26:48 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-20 18:26:48 +0100
commitddbe7d26b10c4374f406b807ae161826cf2096e1 (patch)
tree707b9f2a20edc82251f0c1f14a8d315641211063 /src/testdir/test_channel.py
parent42d38a2db17e70312d073095257555c27a5f9443 (diff)
downloadvim-git-ddbe7d26b10c4374f406b807ae161826cf2096e1.tar.gz
patch 7.4.1370v7.4.1370
Problem: The Python test script may keep on running. Solution: Join the threads. (Yasuhiro Matsumoto)
Diffstat (limited to 'src/testdir/test_channel.py')
-rw-r--r--src/testdir/test_channel.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index ec231e8c8..66fd48f43 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -192,3 +192,8 @@ if __name__ == "__main__":
# Main thread terminates, but the server continues running
# until server.shutdown() is called.
+ try:
+ while server_thread.isAlive():
+ server_thread.join(1)
+ except (KeyboardInterrupt, SystemExit):
+ server.shutdown()