diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-21 13:01:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-21 13:01:53 +0100 |
| commit | 08298fa1d3e32c2af476582792fc4f70cd57a59a (patch) | |
| tree | 29b7c778befe6ba20e3e8cf4a485fba971b755b4 /src | |
| parent | decb14d68c3e3736566466aed2190f1d1cab587a (diff) | |
| download | vim-08298fa1d3e32c2af476582792fc4f70cd57a59a.zip | |
patch 7.4.1377
Problem: Test_connect_waittime() is flaky.
Solution: Ignore the "Connection reset by peer" error.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_channel.vim | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 76c7c4ee2..a05272749 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -304,16 +304,26 @@ func Test_connect_waittime() 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 bc8003ed4..44f80f38f 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1377, +/**/ 1376, /**/ 1375, |