commit ab8b1c14a31e36ae87cc7e13c4a75318d513fc7b
author Bram Moolenaar <Bram@vim.org> Sat Nov 04 19:24:31 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Nov 04 19:24:31 2017 +0100
tree 762a0a88efdadaa53f2a3738501e1095ca6893bc
parent 13deab8d08145c1f6e2a3e82cb547bc7f87a3686

patch 8.0.1260: using global variables for WaitFor()

Problem:    Using global variables for WaitFor().
Solution:   Use a lambda function instead.  Don't check a condition if
            WaitFor() already checked it.

src/testdir/test_quotestar.vim

diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index b7d3158..cc975be 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -60,12 +60,8 @@
   call assert_notmatch(name, serverlist())
 
   let cmd .= ' --servername ' . name
-  let g:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
-  call WaitFor('job_status(g:job) == "run"')
-  if job_status(g:job) != 'run'
-    call assert_report('Cannot run the Vim server')
-    return ''
-  endif
+  let job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'})
+  call WaitFor({-> job_status(job) == "run"})
 
   " Takes a short while for the server to be active.
   call WaitFor('serverlist() =~ "' . name . '"')
@@ -124,11 +120,14 @@
   endif
 
   call remote_send(name, ":qa!\<CR>")
-  call WaitFor('job_status(g:job) == "dead"')
-  if job_status(g:job) != 'dead'
-    call assert_report('Server did not exit')
-    call job_stop(g:job, 'kill')
-  endif
+  try
+    call WaitFor({-> job_status(job) == "dead"})
+  finally
+    if job_status(job) != 'dead'
+      call assert_report('Server did not exit')
+      call job_stop(job, 'kill')
+    endif
+  endtry
 
   return ''
 endfunc