Merge branch 'master' into s-dash-stdin

1 files changed, 17 insertions, 2 deletions

diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua
index 765e3c5919..f79f208b69 100644
--- a/test/functional/core/channels_spec.lua
+++ b/test/functional/core/channels_spec.lua
@@ -1,7 +1,7 @@
 
 local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, eval, next_msg, ok, source = helpers.clear, helpers.eq,
-   helpers.eval, helpers.next_message, helpers.ok, helpers.source
+   helpers.eval, helpers.next_msg, helpers.ok, helpers.source
 local command, funcs, meths = helpers.command, helpers.funcs, helpers.meths
 local sleep = helpers.sleep
 local spawn, nvim_argv = helpers.spawn, helpers.nvim_argv
@@ -246,6 +246,22 @@ describe('channels', function()
     eq({"notification", "exit", {id, 0, {'10 PRINT "NVIM"',
                                          '20 GOTO 10', ''}}}, next_msg())
 
+    -- if dict is reused the new value is not stored,
+    -- but nvim also does not crash
+    command("let id = jobstart(['cat'], g:job_opts)")
+    id = eval("g:id")
+
+    command([[call chansend(id, "cat text\n")]])
+    sleep(10)
+    command("call chanclose(id, 'stdin')")
+
+    -- old value was not overwritten
+    eq({"notification", "exit", {id, 0, {'10 PRINT "NVIM"',
+                                         '20 GOTO 10', ''}}}, next_msg())
+
+    -- and an error was thrown.
+    eq("E5210: dict key 'stdout' already set for buffered stream in channel "..id, eval('v:errmsg'))
+
     -- reset dictionary
     source([[
       let g:job_opts = {
@@ -261,6 +277,5 @@ describe('channels', function()
 
     -- works correctly with no output
     eq({"notification", "exit", {id, 1, {''}}}, next_msg())
-
   end)
 end)