Mercurial > vim

changeset 10458:a57b2284de93 v8.0.0122

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/3fad98e8af247af8ebc49730646282a71ccdd47a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 3 15:23:40 2016 +0100 patch 8.0.0122 Problem: Channel test is still flaky on OS X. Solution: Add a short sleep.
author Christian Brabandt <cb@256bit.org>
date Sat, 03 Dec 2016 15:30:04 +0100
parents 8a2db028d418
children 691b74dcfb68
files src/testdir/test_channel.py src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -126,6 +126,9 @@ class ThreadedTCPRequestHandler(socketse
                         print("sending: {0}".format(cmd))
                         self.request.sendall(cmd.encode('utf-8'))
                         response = "ok"
+                        # Need to wait for Vim to give up, otherwise it
+                        # sometimes fails on OS X.
+                        time.sleep(0.2)
                     elif decoded[1] == 'malformed2':
                         cmd = '"unterminated string'
                         print("sending: {0}".format(cmd))
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    122,
+/**/
     121,
 /**/
     120,