Mercurial > vim
changeset 12742:af961e38e508 v8.0.1249
patch 8.0.1249: no error when WaitFor() gets an invalid wrong expression
commit https://github.com/vim/vim/commit/c20e0d52071a3f6e12321ec3344024faa4695da9
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 2 18:19:19 2017 +0100
patch 8.0.1249: no error when WaitFor() gets an invalid wrong expression
Problem: No error when WaitFor() gets an invalid wrong expression.
Solution: Do not ignore errors in evaluationg the expression. Fix places
where the expression was wrong.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 02 Nov 2017 18:30:05 +0100 |
parents | 5d644b2a30b9 |
children | 19d000527686 |
files | src/testdir/shared.vim src/testdir/test_netbeans.vim src/version.c |
diffstat | 3 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -125,15 +125,12 @@ func WaitFor(expr, ...) let slept = 0 endif for i in range(timeout / 10) - try - if eval(a:expr) - if has('reltime') - return float2nr(reltimefloat(reltime(start)) * 1000) - endif - return slept + if eval(a:expr) + if has('reltime') + return float2nr(reltimefloat(reltime(start)) * 1000) endif - catch - endtry + return slept + endif if !has('reltime') let slept += 10 endif
--- a/src/testdir/test_netbeans.vim +++ b/src/testdir/test_netbeans.vim @@ -19,6 +19,7 @@ endfunc func Nb_basic(port) call delete("Xnetbeans") + call writefile([], "Xnetbeans") exe 'nbstart :localhost:' . a:port . ':bunny' call assert_true(has("netbeans_enabled")) @@ -53,6 +54,9 @@ func Test_nb_basic() endfunc func Nb_file_auth(port) + call delete("Xnetbeans") + call writefile([], "Xnetbeans") + call assert_fails('nbstart =notexist', 'E660:') call writefile(['host=localhost', 'port=' . a:port, 'auth=bunny'], 'Xnbauth') if has('unix')