Merge PR #4398 'Update lua client'

3 files changed, 5 insertions, 2 deletions

diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index dac6757a97..3d90d20ab3 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -62,6 +62,9 @@ describe(':oldfiles!', function()
     _clear()
     execute('rshada! ' .. shada_file)
 
+    -- Ensure nvim is out of "Press ENTER..." screen
+    feed('<cr>')
+    
     -- Ensure v:oldfiles isn't busted.  Since things happen so fast,
     -- the ordering of v:oldfiles is unstable (it uses qsort() under-the-hood).
     -- Let's verify the contents and the length of v:oldfiles before moving on.
diff --git a/test/functional/ex_cmds/wundo_spec.lua b/test/functional/ex_cmds/wundo_spec.lua
index c3147e1c0f..969dfea3d9 100644
--- a/test/functional/ex_cmds/wundo_spec.lua
+++ b/test/functional/ex_cmds/wundo_spec.lua
@@ -24,6 +24,6 @@ describe('u_* functions', function()
                            '-c', 'set undodir=. undofile'})
     set_session(session)
     execute('echo "True"')  -- Should not error out due to crashed Neovim
-    session:exit(0)
+    session:close()
   end)
 end)
diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua
index 207d94124f..21f14be62c 100644
--- a/test/functional/ex_cmds/wviminfo_spec.lua
+++ b/test/functional/ex_cmds/wviminfo_spec.lua
@@ -9,7 +9,7 @@ describe(':wshada', function()
 
   before_each(function()
     if session then
-      session:exit(0)
+      session:close()
     end
 
     -- Override the default session because we need 'swapfile' for these tests.