changeset 20464:235be779549f v8.2.0786

patch 8.2.0786: channel test is flaky on FreeBSD Commit: https://github.com/vim/vim/commit/0b39ec3c7dd41852fa6f0430b3f963c59d0b50d8 Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 17 22:33:53 2020 +0200 patch 8.2.0786: channel test is flaky on FreeBSD Problem: Channel test is flaky on FreeBSD. Solution: Set the sockiet TCP_NODELAY option. Adjust expected line count in netbeans test. (Ozaki Kiichi, closes #6097)
author Bram Moolenaar <Bram@vim.org>
date Sun, 17 May 2020 22:45:03 +0200
parents 9560e7e6c8f3
children deab1563bd2e
files src/testdir/test_channel.py src/testdir/test_netbeans.vim src/version.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -21,6 +21,9 @@ except ImportError:
 
 class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
 
+    def setup(self):
+        self.request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+
     def handle(self):
         print("=== socket opened ===")
         while True:
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -609,7 +609,7 @@ func Nb_basic(port)
 
   " detach
   call appendbufline(cmdbufnr, '$', 'detach_Test')
-  call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 6)')
+  call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 8)')
   call WaitForAssert({-> assert_equal('0:disconnect=91', readfile("Xnetbeans")[-1])})
 
   " the connection was closed
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    786,
+/**/
     785,
 /**/
     784,