2 files changed, 40 insertions, 17 deletions
diff --git a/test/functional/autocmd/signal_spec.lua b/test/functional/autocmd/signal_spec.lua
new file mode 100644
index 0000000000..719adeaf1b
--- /dev/null
+++ b/test/functional/autocmd/signal_spec.lua
@@ -0,0 +1,38 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local command = helpers.command
+local eq = helpers.eq
+local funcs = helpers.funcs
+local next_msg = helpers.next_msg
+
+if helpers.pending_win32(pending) then
+  -- Only applies to POSIX systems.
+  return
+end
+
+local function posix_kill(signame, pid)
+  os.execute('kill -s '..signame..' -- '..pid..' >/dev/null')
+end
+
+describe('autocmd Signal', function()
+  before_each(clear)
+
+  it('matches *', function()
+    command('autocmd Signal * call rpcnotify(1, "foo")')
+    posix_kill('USR1', funcs.getpid())
+    eq({'notification', 'foo', {}}, next_msg())
+  end)
+
+  it('matches SIGUSR1', function()
+    command('autocmd Signal SIGUSR1 call rpcnotify(1, "foo")')
+    posix_kill('USR1', funcs.getpid())
+    eq({'notification', 'foo', {}}, next_msg())
+  end)
+
+  it('does not match unknown patterns', function()
+    command('autocmd Signal SIGUSR2 call rpcnotify(1, "foo")')
+    posix_kill('USR1', funcs.getpid())
+    eq(nil, next_msg(500))
+  end)
+end)
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index 38c7e385cc..7c74e82d17 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -481,25 +481,10 @@ describe("'scrollback' option", function()
     eq(-1, curbufmeths.get_option('scrollback'))
   end)
 
-  it(':setlocal in a normal buffer is an error', function()
-    command('new')
-
-    -- :setlocal to -1 is NOT an error.
-    feed_command('setlocal scrollback=-1')
-    eq(nil, string.match(eval("v:errmsg"), "E%d*:"))
-    feed('<CR>')
-
-    -- :setlocal to anything except -1 is an error.
-    feed_command('setlocal scrollback=42')
-    feed('<CR>')
-    eq('E474:', string.match(eval("v:errmsg"), "E%d*:"))
-    eq(-1, curbufmeths.get_option('scrollback'))
-  end)
-
   it(':set updates local value and global default', function()
     set_fake_shell()
-    command('set scrollback=42')                  -- set global and (attempt) local
-    eq(-1, curbufmeths.get_option('scrollback'))  -- normal buffer: -1
+    command('set scrollback=42')                  -- set global value
+    eq(42, curbufmeths.get_option('scrollback'))
     command('terminal')
     eq(42, curbufmeths.get_option('scrollback'))  -- inherits global default
     command('setlocal scrollback=99')