diff options
| -rw-r--r-- | src/testdir/test_channel.py | 5 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py index 9684bb933a..36aad2b778 100644 --- 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 f2c0d17fce..fc82ada974 100644 --- 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 ebd2c565d2..b01127c34e 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3253, +/**/ 3252, /**/ 3251, |