diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-17 22:33:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-17 22:33:53 +0200 |
| commit | 0b39ec3c7dd41852fa6f0430b3f963c59d0b50d8 (patch) | |
| tree | c53da01a53010ee68a9c4f137cccf9f5ce3d26ca | |
| parent | 6fc3b59ee914a0d1710c8b037a0c592e0a7c34d4 (diff) | |
| download | vim-git-8.2.0786.tar.gz | |
patch 8.2.0786: channel test is flaky on FreeBSDv8.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)
| -rw-r--r-- | src/testdir/test_channel.py | 3 | ||||
| -rw-r--r-- | src/testdir/test_netbeans.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py index 6b2947d90..8dba3ba4c 100644 --- 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 7f1dab46d..781f179c3 100644 --- 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 232fbb09c..d04f529d9 100644 --- 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, |