aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.0.0122

Browse Source 
Problem:    Channel test is still flaky on OS X.
Solution:   Add a short sleep.
This commit is contained in:
Bram Moolenaar
2016-12-03 15:23:40 +01:00
parent a2477fd349
commit 3fad98e8af
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_channel.py
View File

@@ -126,6 +126,9 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
print("sending: {0}".format(cmd)) print("sending: {0}".format(cmd))
self.request.sendall(cmd.encode('utf-8')) self.request.sendall(cmd.encode('utf-8'))
response = "ok" 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': elif decoded[1] == 'malformed2':
cmd = '"unterminated string' cmd = '"unterminated string'
print("sending: {0}".format(cmd)) print("sending: {0}".format(cmd))

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
122,
/**/ /**/
121, 121,
/**/ /**/