patch 7.4.1247

Problem:    The channel test doesn't run on MS-Windows.
Solution:   Make it work on the MS-Windows console. (Ken Takata)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index a706243e4390afc7b0369c2f508aee6c0a5efdf6..236449483151696ee86f0e03cfbce2de41bd3c8c 100755 (executable)
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -7,12 +7,6 @@
 # Then Vim can send requests to the server:
 #  :let response = ch_sendexpr(handle, 'hello!')
 #
-# And you can control Vim by typing a JSON message here, e.g.:
-#   ["ex","echo 'hi there'"]
-#
-# There is no prompt, just type a line and press Enter.
-# To exit cleanly type "quit<Enter>".
-#
 # See ":help channel-demo" in Vim.
 #
 # This requires Python 2.6 or later.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 140691c3984c1ba9b951145799906383b9b0e191..ee7a422447f97910a4b1716614a8704861cdf155 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -2,14 +2,40 @@
 scriptencoding utf-8
 
 " This requires the Python command to run the test server.
-" This most likely only works on Unix.
-if !has('unix') || !executable('python')
+" This most likely only works on Unix and Windows console.
+if has('unix')
+  if !executable('python')
+    finish
+  endif
+elseif has('win32') && !has('gui_win32')
+  " Use Python Launcher for Windows (py.exe).
+  if !executable('py')
+    finish
+  endif
+else
   finish
 endif
 
+func s:start_server()
+  if has('win32')
+    silent !start cmd /c start "test_channel" py test_channel.py
+  else
+    silent !./test_channel.py&
+  endif
+endfunc
+
+func s:kill_server()
+  if has('win32')
+    call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
+  else
+    call system("killall test_channel.py")
+  endif
+endfunc
+
 func Test_communicate()
+  call delete("Xportnr")
   " The Python program writes the port number in Xportnr.
-  silent !./test_channel.py&
+  call s:start_server()
 
   " Wait for up to 2 seconds for the port number to be there.
   let cnt = 20
@@ -29,7 +55,7 @@ func Test_communicate()
 
   if len(l) == 0
     " Can't make the connection, give up.
-    call system("killall test_channel.py")
+    call s:kill_server()
     return
   endif
   let port = l[0]
@@ -49,5 +75,5 @@ func Test_communicate()
   " make the server quit, can't check if this works, should not hang.
   call ch_sendexpr(handle, '!quit!', 0)
 
-  call system("killall test_channel.py")
+  call s:kill_server()
 endfunc

diff --git a/src/version.c b/src/version.c
index 6aa4baa932c76988b55243eabf40626c7a97dfd2..9417f5e4456a07cd389cf4987dedb70ddbd10a89 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1247,
 /**/
     1246,
 /**/