# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1480775404 -3600
# Node ID a57b2284de9348c243da35bca8bd1d0f32a293ed
# Parent  8a2db028d41873c286186f67f75c301e54f19e05
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.

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
--- 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))
diff --git a/src/version.c b/src/version.c
--- 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,