Mercurial > vim

changeset 8153:240deebfadde v7.4.1370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/ddbe7d26b10c4374f406b807ae161826cf2096e1 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 20 18:26:48 2016 +0100 patch 7.4.1370 Problem: The Python test script may keep on running. Solution: Join the threads. (Yasuhiro Matsumoto)
author Christian Brabandt <cb@256bit.org>
date Sat, 20 Feb 2016 18:30:05 +0100
parents 2eb4504a833d
children 02529d824393
files src/testdir/test_channel.py src/version.c
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1370,
+/**/
     1369,
 /**/
     1368,