patch 7.4.1377
Problem: Test_connect_waittime() is flaky.
Solution: Ignore the "Connection reset by peer" error.
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 76c7c4e..a052727 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -304,16 +304,26 @@
call assert_true(reltimefloat(elapsed) < 1.0)
endif
+ " We intend to use a socket that doesn't exist and wait for half a second
+ " before giving up. If the socket does exist it can fail in various ways.
+ " Check for "Connection reset by peer" to avoid flakyness.
let start = reltime()
- let handle = ch_open('localhost:9867', {'waittime': 500})
- if ch_status(handle) != "fail"
- " Oops, port does exists.
- call ch_close(handle)
- else
- " Failed connection should wait about 500 msec.
- let elapsed = reltime(start)
- call assert_true(reltimefloat(elapsed) < 1.0)
- endif
+ try
+ let handle = ch_open('localhost:9867', {'waittime': 500})
+ if ch_status(handle) != "fail"
+ " Oops, port does exists.
+ call ch_close(handle)
+ else
+ " Failed connection should wait about 500 msec.
+ let elapsed = reltime(start)
+ call assert_true(reltimefloat(elapsed) > 0.3)
+ call assert_true(reltimefloat(elapsed) < 1.0)
+ endif
+ catch
+ if v:exception !~ 'Connection reset by peer'
+ call assert_false(1, "Caught exception: " . v:exception)
+ endif
+ endtry
endfunc
func Test_raw_pipe()
diff --git a/src/version.c b/src/version.c
index bc8003e..44f80f3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1377,
+/**/
1376,
/**/
1375,
