diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-08 19:07:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-08 19:07:22 +0100 |
| commit | d9d473ea124339c4dd173127db47c4583645ac2c (patch) | |
| tree | 72e3b243b810f653adeb7997659c6c8a26c018b0 | |
| parent | 13d6fb17a2c5d2ae02429e31fc8603a9caa4395e (diff) | |
patch 7.4.1520v7.4.1520
Problem: Channel test: Waiting for a file to appear doesn't work.
Solution: In waitFor() ignore errors.
| -rw-r--r-- | src/testdir/test_channel.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 15d849c03a..061b30c251 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -103,9 +103,12 @@ endfunc " Wait for up to a second for "expr" to become true. func s:waitFor(expr) for i in range(100) - if eval(a:expr) - return - endif + try + if eval(a:expr) + return + endif + catch + endtry sleep 10m endfor endfunc diff --git a/src/version.c b/src/version.c index be05a459cf..15baf5df9d 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 */ /**/ + 1520, +/**/ 1519, /**/ 1518, |