patch 8.2.3253: channel test fails randomly

Problem:    Channel test fails randomly.
Solution:   Add a sleep after sending the "echoerr" command. (Michael Soyka)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 9684bb933a147923e2e71552618b201b7b1636ec..36aad2b778a0aa78c130382cdff6d8afdafce222 100644 (file)
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -114,6 +114,11 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                         print("sending: {0}".format(cmd))
                         self.request.sendall(cmd.encode('utf-8'))
                         response = "ok"
+                        # Wait a bit, so that the "ex" command is handled
+                        # before the "ch_evalexpr() returns.  Otherwise we are
+                        # outside the try/catch when the "ex" command is
+                        # handled.
+                        time.sleep(0.02)
                     elif decoded[1] == 'bad command':
                         cmd = '["ex","foo bar"]'
                         print("sending: {0}".format(cmd))

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index f2c0d17fce66ad37845294b073790db6c99cf36a..fc82ada97488b318c32ccfc4fdaccd529c1a0197 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -253,11 +253,6 @@ endfunc
 func Test_communicate_ipv6()
   CheckIPv6
 
-  " FIXME: this test is very flaky on MS-Windows
-  if has('win32')
-    throw 'Skipped: test is very flaky with MS-Windows'
-  endif
-
   call Test_communicate()
 endfunc
 

diff --git a/src/version.c b/src/version.c
index ebd2c565d25c901a259f49b007996a9eb1bbbfd4..b01127c34efcd3fca347779655197bbc41ad9e90 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3253,
 /**/
     3252,
 /**/