# HG changeset patch # User Bram Moolenaar # Date 1589748303 -7200 # Node ID 235be779549fb73505824b115e65642a96a108b1 # Parent 9560e7e6c8f37d5a47d8916af82e2184e05c351c patch 8.2.0786: channel test is flaky on FreeBSD Commit: https://github.com/vim/vim/commit/0b39ec3c7dd41852fa6f0430b3f963c59d0b50d8 Author: Bram Moolenaar 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) 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 @@ -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 --- 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 --- 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,