diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-12 13:48:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-12 13:48:49 +0100 |
| commit | ac42afd10b96424b89762871905e3e785cdfba3d (patch) | |
| tree | 33b196afe6a764677058fdeebc000d76d1af97ca | |
| parent | 8e2c942ce49f2555d7dc2088cf3aa856820c5e32 (diff) | |
| download | vim-git-ac42afd10b96424b89762871905e3e785cdfba3d.tar.gz | |
patch 7.4.1540v7.4.1540
Problem: Channel test is a bit flaky.
Solution: Increase expected wait time.
| -rw-r--r-- | src/testdir/test_channel.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 5f2b97f70..a2d41252c 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -442,10 +442,11 @@ func Test_connect_waittime() " Oops, port does exists. call ch_close(handle) else - " Failed connection should wait about 500 msec. + " Failed connection should wait about 500 msec. Can be longer if the + " computer is busy with other things. let elapsed = reltime(start) call assert_true(reltimefloat(elapsed) > 0.3) - call assert_true(reltimefloat(elapsed) < 1.0) + call assert_true(reltimefloat(elapsed) < 1.5) endif catch if v:exception !~ 'Connection reset by peer' diff --git a/src/version.c b/src/version.c index 6613b7456..3e802b58f 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1540, +/**/ 1539, /**/ 1538, |