# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455989405 -3600
# Node ID 240deebfadde981c839e4f2de22c43f1fffa736d
# Parent  2eb4504a833d737c34f31f174605f568743ce2de
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)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
--- 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()
diff --git a/src/version.c b/src/version.c
--- 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,