Merge remote-tracking branch 'upstream/master' into userreguserreg

1 files changed, 17 insertions, 2 deletions

diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index ceff390dc5..1ad4ad3a02 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -199,7 +199,7 @@ describe('server -> client', function()
 
     it('can communicate buffers, tabpages, and windows', function()
       eq({1}, eval("rpcrequest(vim, 'nvim_list_tabpages')"))
-      -- Window IDs start at 1000 (LOWEST_WIN_ID in vim.h)
+      -- Window IDs start at 1000 (LOWEST_WIN_ID in window.h)
       eq({1000}, eval("rpcrequest(vim, 'nvim_list_wins')"))
 
       local buf = eval("rpcrequest(vim, 'nvim_list_bufs')")[1]
@@ -237,7 +237,7 @@ describe('server -> client', function()
         \ }
       ]])
       meths.set_var("args", {
-        helpers.test_lua_prg,
+        nvim_prog, '-ll',
         'test/functional/api/rpc_fixture.lua',
         package.path,
         package.cpath,
@@ -337,6 +337,21 @@ describe('server -> client', function()
       eq('localhost:', string.sub(address,1,10))
       connect_test(server, 'tcp', address)
     end)
+
+    it('does not crash on receiving UI events', function()
+      local server = spawn(nvim_argv)
+      set_session(server)
+      local address = funcs.serverlist()[1]
+      local client = spawn(nvim_argv, false, nil, true)
+      set_session(client)
+
+      local id = funcs.sockconnect('pipe', address, {rpc=true})
+      funcs.rpcrequest(id, 'nvim_ui_attach', 80, 24, {})
+      assert_alive()
+
+      server:close()
+      client:close()
+    end)
   end)
 
   describe('connecting to its own pipe address', function()