From 3fad98e8af247af8ebc49730646282a71ccdd47a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 3 Dec 2016 15:23:40 +0100
Subject: [PATCH] patch 8.0.0122 Problem:    Channel test is still flaky on OS
 X. Solution:   Add a short sleep.

---
 src/testdir/test_channel.py | 3 +++
 src/version.c               | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 07a22418a8..6668752c42 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -126,6 +126,9 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                         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
index 7089a83a96..06986069d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    122,
 /**/
     121,
 /**/