3 files changed, 78 insertions, 4 deletions
diff --git a/test/functional/ex_cmds/arg_spec.lua b/test/functional/ex_cmds/arg_spec.lua
new file mode 100644
index 0000000000..e66dc62491
--- /dev/null
+++ b/test/functional/ex_cmds/arg_spec.lua
@@ -0,0 +1,30 @@
+local helpers = require("test.functional.helpers")(after_each)
+local eq, execute, funcs = helpers.eq, helpers.execute, helpers.funcs
+local ok = helpers.ok
+local clear = helpers.clear
+
+describe(":argument", function()
+  before_each(function() 
+    clear()
+  end)
+
+  it("does not restart :terminal buffer", function()
+      execute("terminal")
+      helpers.feed([[<C-\><C-N>]])
+      execute("argadd")
+      helpers.feed([[<C-\><C-N>]])
+      local bufname_before = funcs.bufname("%")
+      local bufnr_before = funcs.bufnr("%")
+      helpers.ok(nil ~= string.find(bufname_before, "^term://"))  -- sanity
+
+      execute("argument 1")
+      helpers.feed([[<C-\><C-N>]])
+
+      local bufname_after = funcs.bufname("%")
+      local bufnr_after = funcs.bufnr("%")
+      eq("\n["..bufname_before.."] ", helpers.eval('execute("args")'))
+      ok(funcs.line('$') > 1)
+      eq(bufname_before, bufname_after)
+      eq(bufnr_before, bufnr_after)
+  end)
+end)
diff --git a/test/functional/ex_cmds/edit_spec.lua b/test/functional/ex_cmds/edit_spec.lua
new file mode 100644
index 0000000000..9e197d7466
--- /dev/null
+++ b/test/functional/ex_cmds/edit_spec.lua
@@ -0,0 +1,26 @@
+local helpers = require("test.functional.helpers")(after_each)
+local eq, execute, funcs = helpers.eq, helpers.execute, helpers.funcs
+local ok = helpers.ok
+local clear = helpers.clear
+
+describe(":edit", function()
+  before_each(function() 
+    clear()
+  end)
+
+  it("without arguments does not restart :terminal buffer", function()
+      execute("terminal")
+      helpers.feed([[<C-\><C-N>]])
+      local bufname_before = funcs.bufname("%")
+      local bufnr_before = funcs.bufnr("%")
+      helpers.ok(nil ~= string.find(bufname_before, "^term://"))  -- sanity
+
+      execute("edit")
+
+      local bufname_after = funcs.bufname("%")
+      local bufnr_after = funcs.bufnr("%")
+      ok(funcs.line('$') > 1)
+      eq(bufname_before, bufname_after)
+      eq(bufnr_before, bufnr_after)
+  end)
+end)
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 6f929f17e4..09b4eaa8d5 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -13,13 +13,19 @@ describe(':terminal', function()
     clear()
     screen = Screen.new(50, 4)
     screen:attach({rgb=false})
+    -- shell-test.c is a fake shell that prints its arguments and exits.
     nvim('set_option', 'shell', nvim_dir..'/shell-test')
     nvim('set_option', 'shellcmdflag', 'EXE')
-
   end)
 
+  -- Invokes `:terminal {cmd}` using a fake shell (shell-test.c) which prints
+  -- the {cmd} and exits immediately .
+  local function terminal_run_fake_shell_cmd(cmd)
+    execute("terminal "..(cmd and cmd or ""))
+  end
+
   it('with no argument, acts like termopen()', function()
-    execute('terminal')
+    terminal_run_fake_shell_cmd()
     wait()
     screen:expect([[
       ready $                                           |
@@ -30,7 +36,7 @@ describe(':terminal', function()
   end)
 
   it('executes a given command through the shell', function()
-    execute('terminal echo hi')
+    terminal_run_fake_shell_cmd('echo hi')
     wait()
     screen:expect([[
       ready $ echo hi                                   |
@@ -41,7 +47,7 @@ describe(':terminal', function()
   end)
 
   it('allows quotes and slashes', function()
-    execute([[terminal echo 'hello' \ "world"]])
+    terminal_run_fake_shell_cmd([[echo 'hello' \ "world"]])
     wait()
     screen:expect([[
       ready $ echo 'hello' \ "world"                    |
@@ -58,4 +64,16 @@ describe(':terminal', function()
       -- Verify that BufNew actually fired (else the test is invalid).
     eq('foo', eval('&shell'))
   end)
+
+  it('ignores writes if the backing stream closes', function()
+      terminal_run_fake_shell_cmd()
+      helpers.feed('iiXXXXXXX')
+      wait()
+      -- Race: Though the shell exited (and streams were closed by SIGCHLD
+      -- handler), :terminal cleanup is pending on the main-loop.
+      -- This write should be ignored (not crash, #5445).
+      helpers.feed('iiYYYYYYY')
+      wait()
+  end)
+
 end)