# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455057905 -3600
# Node ID d65aa95725d3cee396e87917e98a8a6b1fde7546
# Parent  f93c3ee063549246fa1ad82f0e1ad8f5f02fc7f0
commit https://github.com/vim/vim/commit/a483326e3b04215b86fe9c582ac96bb9679f0812
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Feb 9 23:33:25 2016 +0100

    patch 7.4.1297
    Problem:    On Mac test_channel leaves python instances running.
    Solution:   Use a small waittime to make ch_open() work. (Ozaki Kiichi)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -23,6 +23,7 @@ else
 endif
 
 let s:port = -1
+let s:chopt = has('macunix') ? {'waittime' : 1} : {}
 
 func s:start_server()
   " The Python program writes the port number in Xportnr.
@@ -60,7 +61,7 @@ func s:start_server()
   endif
   let s:port = l[0]
 
-  let handle = ch_open('localhost:' . s:port)
+  let handle = ch_open('localhost:' . s:port, s:chopt)
   return handle
 endfunc
 
@@ -155,7 +156,7 @@ func Test_two_channels()
   endif
   call assert_equal('got it', ch_sendexpr(handle, 'hello!'))
 
-  let newhandle = ch_open('localhost:' . s:port)
+  let newhandle = ch_open('localhost:' . s:port, s:chopt)
   call assert_equal('got it', ch_sendexpr(newhandle, 'hello!'))
   call assert_equal('got it', ch_sendexpr(handle, 'hello!'))
 
@@ -181,7 +182,7 @@ endfunc
 " Test that trying to connect to a non-existing port fails quickly.
 func Test_connect_waittime()
   let start = reltime()
-  let handle = ch_open('localhost:9876')
+  let handle = ch_open('localhost:9876', s:chopt)
   if handle >= 0
     " Oops, port does exists.
     call ch_close(handle)
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 */
 /**/
+    1297,
+/**/
     1296,
 /**/
     1295,