commit 3fad98e8af247af8ebc49730646282a71ccdd47a
author Bram Moolenaar <Bram@vim.org> Sat Dec 03 15:23:40 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Dec 03 15:23:40 2016 +0100
tree 6a84741ddaa85443b8b1ace58969ed55e33f612f
parent a2477fd3490c1166522631eee53c57d34321086a

patch 8.0.0122
Problem:    Channel test is still flaky on OS X.
Solution:   Add a short sleep.

src/testdir/test_channel.py

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 07a2241..6668752 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -126,6 +126,9 @@
                         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))

src/version.c

diff --git a/src/version.c b/src/version.c
index 7089a83..0698606 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    122,
+/**/
     121,
 /**/
     120,