3 files changed, 38 insertions, 10 deletions
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index fa38671529..e27adc1a51 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -303,6 +303,26 @@ describe('jobs', function()
     ]])
   end)
 
+  it('requires funcrefs for script-local (s:) functions', function()
+    -- Pass job callback names _without_ `function(...)`.
+    source([[
+      function! s:OnEvent(id, data, event) dict
+        let g:job_result = get(self, 'user')
+      endfunction
+      let s:job = jobstart(['echo'], {
+        \ 'on_stdout': 's:OnEvent',
+        \ 'on_stderr': 's:OnEvent',
+        \ 'on_exit':   's:OnEvent',
+        \ 'user': 2349
+        \ })
+    ]])
+
+    -- The behavior is asynchronous, retry until a time limit.
+    helpers.retry(nil, 10000, function()
+      eq("E120:", string.match(eval("v:errmsg"), "E%d*:"))
+    end)
+  end)
+
   describe('jobwait', function()
     it('returns a list of status codes', function()
       source([[
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index d1ab02f361..f3332cff4f 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,4 +1,5 @@
 require('coxpcall')
+local luv = require('luv')
 local lfs = require('lfs')
 local global_helpers = require('test.helpers')
 
@@ -243,17 +244,24 @@ local function connect(file_or_address)
   return Session.new(stream)
 end
 
--- Calls fn() until it returns without error, up to `max` times.
-local function retry(fn, max)
-  local retries = max and (max - 1) or 2
-  for _ = 1, retries do
-    local success = pcall(fn)
-    if success then
-      return
+-- Calls fn() until it succeeds, up to `max` times or until `max_ms`
+-- milliseconds have passed.
+local function retry(max, max_ms, fn)
+  local tries = 1
+  local timeout = (max_ms and max_ms > 0) and max_ms or 10000
+  local start_time = luv.now()
+  while true do
+    local status, result = pcall(fn)
+    if status then
+      return result
+    end
+    if (max and tries >= max) or (luv.now() - start_time > timeout) then
+      break
     end
+    tries = tries + 1
   end
-  -- pcall() is not used for the final attempt so failure can bubble up.
-  fn()
+  -- Do not use pcall() for the final attempt, let the failure bubble up.
+  return fn()
 end
 
 local function clear(...)
diff --git a/test/functional/legacy/061_undo_tree_spec.lua b/test/functional/legacy/061_undo_tree_spec.lua
index 2069204938..aeb2001d11 100644
--- a/test/functional/legacy/061_undo_tree_spec.lua
+++ b/test/functional/legacy/061_undo_tree_spec.lua
@@ -98,7 +98,7 @@ describe('undo tree:', function()
         expect_line('123456abc')
       end
 
-      helpers.retry(test_earlier_later)
+      helpers.retry(2, nil, test_earlier_later)
     end)
 
     it('file-write specifications', function()