4 files changed, 18 insertions, 1 deletions
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index 1c4d5a5c6b..f9769c706f 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -828,6 +828,10 @@ describe('cmdline redraw', function()
   end)
 
   it('with <Cmd>', function()
+    if 'openbsd' == helpers.uname() then
+      pending('FIXME #10804', function() end)
+      return
+    end
     command('cmap a <Cmd>call sin(0)<CR>')  -- no-op
     feed(':012345678901234567890123456789')
     screen:expect{grid=[[
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index 0f50baa73f..5e09dc4289 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -49,6 +49,10 @@ local function test_embed(ext_linegrid)
   end)
 
   it("doesn't erase output when setting color scheme", function()
+    if 'openbsd' == helpers.uname() then
+      pending('FIXME #10804', function() end)
+      return
+    end
     startup('--cmd', 'echoerr "foo"', '--cmd', 'color default', '--cmd', 'echoerr "bar"')
     screen:expect([[
                                                                   |
diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua
index 139ef5964e..c028f44b44 100644
--- a/test/functional/ui/output_spec.lua
+++ b/test/functional/ui/output_spec.lua
@@ -50,6 +50,10 @@ describe("shell command :!", function()
   end)
 
   it("throttles shell-command output greater than ~10KB", function()
+    if 'openbsd' == helpers.uname() then
+      pending('FIXME #10804', function() end)
+      return
+    end
     child_session.feed_data(":!"..nvim_dir.."/shell-test REP 30001 foo\n")
 
     -- If we observe any line starting with a dot, then throttling occurred.
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 02be714e0d..0e3b903398 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -615,7 +615,12 @@ function Screen:_redraw(updates)
       local handler_name = '_handle_'..method
       local handler = self[handler_name]
       if handler ~= nil then
-        handler(self, unpack(update[i]))
+        local status, res = pcall(handler, self, unpack(update[i]))
+        if not status then
+          error(handler_name..' failed'
+            ..'\n  payload: '..inspect(update)
+            ..'\n  error:   '..tostring(res))
+        end
       else
         assert(self._on_event,
           "Add Screen:"..handler_name.." or call Screen:set_on_event_handler")