To: vim_dev@googlegroups.com
Subject: Patch 8.2.0786
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0786
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)
Files:      src/testdir/test_channel.py, src/testdir/test_netbeans.vim


*** ../vim-8.2.0785/src/testdir/test_channel.py	2020-04-12 17:52:49.429492390 +0200
--- src/testdir/test_channel.py	2020-05-17 22:30:12.099796419 +0200
***************
*** 21,26 ****
--- 21,29 ----
  
  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:
*** ../vim-8.2.0785/src/testdir/test_netbeans.vim	2020-05-13 17:16:01.254232466 +0200
--- src/testdir/test_netbeans.vim	2020-05-17 22:30:12.099796419 +0200
***************
*** 609,615 ****
  
    " detach
    call appendbufline(cmdbufnr, '$', 'detach_Test')
!   call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 6)')
    call WaitForAssert({-> assert_equal('0:disconnect=91', readfile("Xnetbeans")[-1])})
  
    " the connection was closed
--- 609,615 ----
  
    " detach
    call appendbufline(cmdbufnr, '$', 'detach_Test')
!   call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 8)')
    call WaitForAssert({-> assert_equal('0:disconnect=91', readfile("Xnetbeans")[-1])})
  
    " the connection was closed
*** ../vim-8.2.0785/src/version.c	2020-05-17 22:27:36.728262245 +0200
--- src/version.c	2020-05-17 22:32:01.047467498 +0200
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     786,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
124. You begin conversations with, "Who is your internet service provider?"

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///