patch 8.0.1249: no error when WaitFor() gets an invalid wrong expressionv8.0.1249

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.

2 files changed, 9 insertions, 8 deletions

diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index eb43cf4e74..d6033d5811 100644
--- 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
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 4ac03db6f5..aa4e67661a 100644
--- 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')