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)

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 6b2947d904a12699c53f85fd20cfcef2e48e9a84..8dba3ba4ca79ec414e2d0a46569859bd81bf4c7e 100644 (file)
--- 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:

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 7f1dab46dd16803ae0942536909fa24ef3258898..781f179c384f7c0b0d956cda00dd4394ea7c733d 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 232fbb09c05caf18880140adf8e174ce453b07b5..d04f529d9bfcce0affe6f1136177a3a3730cb781 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    786,
 /**/
     785,
 /**/