Merge pull request #21881 from bfredl/uniterror

fix(unittests): do not consider process crash to be a success

src/nvim/tui/input.c

@@ -655,7 +655,7 @@ static HandleState handle_background_color(TermInput *input)
     bool is_dark = luminance < 0.5;
     char *bgvalue = is_dark ? "dark" : "light";
     DLOG("bg response: %s", bgvalue);
-    ui_client_bg_respose = is_dark ? kTrue : kFalse;
+    ui_client_bg_response = is_dark ? kTrue : kFalse;
     set_bg(bgvalue);
     input->waiting_for_bg_response = 0;
   } else if (!done && !bad) {

src/nvim/ui_client.c

@@ -84,8 +84,8 @@ void ui_client_run(bool remote_ui)
   if (term) {
     PUT(opts, "term_name", STRING_OBJ(cstr_to_string(term)));
   }
-  if (ui_client_bg_respose != kNone) {
+  if (ui_client_bg_response != kNone) {
-    bool is_dark = (ui_client_bg_respose == kTrue);
+    bool is_dark = (ui_client_bg_response == kTrue);
     PUT_C(opts, "term_background", STRING_OBJ(cstr_as_string(is_dark ? "dark" : "light")));
   }
   PUT_C(opts, "term_colors", INTEGER_OBJ(t_colors));

src/nvim/ui_client.h

@@ -31,7 +31,7 @@ EXTERN bool ui_client_attached INIT(= false);
 
 /// Whether ui client has gotten a response about the bg color of the terminal,
 /// kTrue=dark, kFalse=light, kNone=no response yet
-EXTERN TriState ui_client_bg_respose INIT(= kNone);
+EXTERN TriState ui_client_bg_response INIT(= kNone);
 
 /// The ui client should forward its stdin to the nvim process
 /// by convention, this uses fd=3 (next free number after stdio)

test/unit/eval/typval_spec.lua

@@ -2175,7 +2175,8 @@ describe('typval.c', function()
         eq({a='TSET'}, dct2tbl(d1))
         eq({a='TSET'}, dct2tbl(d2))
       end)
-      itp('disallows overriding builtin or user functions', function()
+      pending('disallows overriding builtin or user functions: here be the dragons', function()
+        -- pending: see TODO below
         local d = dict()
         d.dv_scope = lib.VAR_DEF_SCOPE
         local f_lua = {
@@ -2196,6 +2197,7 @@ describe('typval.c', function()
         local d5 = dict({Test=f_tv})
         local d6 = dict({Test=p_tv})
         eval0([[execute("function Test()\nendfunction")]])
+        -- TODO: test breaks at this point
         tv_dict_extend(d, d2, 'force',
                        'E704: Funcref variable name must start with a capital: tr')
         tv_dict_extend(d, d3, 'force',

test/unit/helpers.lua

@@ -7,9 +7,6 @@ local global_helpers = require('test.helpers')
 local assert = require('luassert')
 local say = require('say')
 
-local posix = nil
-local syscall = nil
-
 local check_cores = global_helpers.check_cores
 local dedent = global_helpers.dedent
 local neq = global_helpers.neq
@@ -373,122 +370,91 @@ local function to_cstr(string)
   return cstr(#string + 1, string)
 end
 
-local sc
+cimport_immediate('./test/unit/fixtures/posix.h')
-
+local sc = {
-if posix ~= nil then
+  fork = function()
-  sc = {
+    return tonumber(ffi.C.fork())
-    fork = posix.fork,
+  end,
-    pipe = posix.pipe,
+  pipe = function()
-    read = posix.read,
+    local ret = ffi.new('int[2]', {-1, -1})
-    write = posix.write,
+    ffi.errno(0)
-    close = posix.close,
+    local res = ffi.C.pipe(ret)
-    wait = posix.wait,
+    if (res ~= 0) then
-    exit = posix._exit,
+      local err = ffi.errno(0)
-  }
+      assert(res == 0, ("pipe() error: %u: %s"):format(
-elseif syscall ~= nil then
+      err, ffi.string(ffi.C.strerror(err))))
-  sc = {
+    end
-    fork = syscall.fork,
+    assert(ret[0] ~= -1 and ret[1] ~= -1)
-    pipe = function()
+    return ret[0], ret[1]
-      local ret = {syscall.pipe()}
+  end,
-      return ret[3], ret[4]
+  read = function(rd, len)
-    end,
+    local ret = ffi.new('char[?]', len, {0})
-    read = function(rd, len)
+    local total_bytes_read = 0
-      return rd:read(nil, len)
+    ffi.errno(0)
-    end,
+    while total_bytes_read < len do
-    write = function(wr, s)
+      local bytes_read = tonumber(ffi.C.read(
-      return wr:write(s)
+      rd,
-    end,
+      ffi.cast('void*', ret + total_bytes_read),
-    close = function(p)
+      len - total_bytes_read))
-      return p:close()
+      if bytes_read == -1 then
-    end,
-    wait = syscall.wait,
-    exit = syscall.exit,
-  }
-else
-  cimport_immediate('./test/unit/fixtures/posix.h')
-  sc = {
-    fork = function()
-      return tonumber(ffi.C.fork())
-    end,
-    pipe = function()
-      local ret = ffi.new('int[2]', {-1, -1})
-      ffi.errno(0)
-      local res = ffi.C.pipe(ret)
-      if (res ~= 0) then
         local err = ffi.errno(0)
-        assert(res == 0, ("pipe() error: %u: %s"):format(
+        if err ~= ffi.C.kPOSIXErrnoEINTR then
-            err, ffi.string(ffi.C.strerror(err))))
+          assert(false, ("read() error: %u: %s"):format(
+          err, ffi.string(ffi.C.strerror(err))))
+        end
+      elseif bytes_read == 0 then
+        break
+      else
+        total_bytes_read = total_bytes_read + bytes_read
       end
-      assert(ret[0] ~= -1 and ret[1] ~= -1)
+    end
-      return ret[0], ret[1]
+    return ffi.string(ret, total_bytes_read)
-    end,
+  end,
-    read = function(rd, len)
+  write = function(wr, s)
-      local ret = ffi.new('char[?]', len, {0})
+    local wbuf = to_cstr(s)
-      local total_bytes_read = 0
+    local total_bytes_written = 0
-      ffi.errno(0)
+    ffi.errno(0)
-      while total_bytes_read < len do
+    while total_bytes_written < #s do
-        local bytes_read = tonumber(ffi.C.read(
+      local bytes_written = tonumber(ffi.C.write(
-            rd,
+      wr,
-            ffi.cast('void*', ret + total_bytes_read),
+      ffi.cast('void*', wbuf + total_bytes_written),
-            len - total_bytes_read))
+      #s - total_bytes_written))
-        if bytes_read == -1 then
+      if bytes_written == -1 then
-          local err = ffi.errno(0)
+        local err = ffi.errno(0)
-          if err ~= ffi.C.kPOSIXErrnoEINTR then
+        if err ~= ffi.C.kPOSIXErrnoEINTR then
-            assert(false, ("read() error: %u: %s"):format(
+          assert(false, ("write() error: %u: %s ('%s')"):format(
-                err, ffi.string(ffi.C.strerror(err))))
+          err, ffi.string(ffi.C.strerror(err)), s))
-          end
+        end
-        elseif bytes_read == 0 then
+      elseif bytes_written == 0 then
+        break
+      else
+        total_bytes_written = total_bytes_written + bytes_written
+      end
+    end
+    return total_bytes_written
+  end,
+  close = ffi.C.close,
+  wait = function(pid)
+    ffi.errno(0)
+    local stat_loc = ffi.new('int[1]', {0})
+    while true do
+      local r = ffi.C.waitpid(pid, stat_loc, ffi.C.kPOSIXWaitWUNTRACED)
+      if r == -1 then
+        local err = ffi.errno(0)
+        if err == ffi.C.kPOSIXErrnoECHILD then
           break
-        else
+        elseif err ~= ffi.C.kPOSIXErrnoEINTR then
-          total_bytes_read = total_bytes_read + bytes_read
+          assert(false, ("waitpid() error: %u: %s"):format(
+          err, ffi.string(ffi.C.strerror(err))))
         end
+      else
+        assert(r == pid)
       end
-      return ffi.string(ret, total_bytes_read)
+    end
-    end,
+    return stat_loc[0]
-    write = function(wr, s)
+  end,
-      local wbuf = to_cstr(s)
+  exit = ffi.C._exit,
-      local total_bytes_written = 0
+}
-      ffi.errno(0)
-      while total_bytes_written < #s do
-        local bytes_written = tonumber(ffi.C.write(
-            wr,
-            ffi.cast('void*', wbuf + total_bytes_written),
-            #s - total_bytes_written))
-        if bytes_written == -1 then
-          local err = ffi.errno(0)
-          if err ~= ffi.C.kPOSIXErrnoEINTR then
-            assert(false, ("write() error: %u: %s ('%s')"):format(
-                err, ffi.string(ffi.C.strerror(err)), s))
-          end
-        elseif bytes_written == 0 then
-          break
-        else
-          total_bytes_written = total_bytes_written + bytes_written
-        end
-      end
-      return total_bytes_written
-    end,
-    close = ffi.C.close,
-    wait = function(pid)
-      ffi.errno(0)
-      while true do
-        local r = ffi.C.waitpid(pid, nil, ffi.C.kPOSIXWaitWUNTRACED)
-        if r == -1 then
-          local err = ffi.errno(0)
-          if err == ffi.C.kPOSIXErrnoECHILD then
-            break
-          elseif err ~= ffi.C.kPOSIXErrnoEINTR then
-            assert(false, ("waitpid() error: %u: %s"):format(
-                err, ffi.string(ffi.C.strerror(err))))
-          end
-        else
-          assert(r == pid)
-        end
-      end
-    end,
-    exit = ffi.C._exit,
-  }
-end
 
 local function format_list(lst)
   local ret = ''
@@ -730,18 +696,22 @@ local function check_child_err(rd)
   end
 end
 
-local function itp_parent(rd, pid, allow_failure)
+local function itp_parent(rd, pid, allow_failure, location)
-  local err, emsg = pcall(check_child_err, rd)
+  local ok, emsg = pcall(check_child_err, rd)
-  sc.wait(pid)
+  local status = sc.wait(pid)
   sc.close(rd)
-  if not err then
+  if not ok then
     if allow_failure then
-      io.stderr:write('Errorred out:\n' .. tostring(emsg) .. '\n')
+      io.stderr:write('Errorred out ('..status..'):\n' .. tostring(emsg) .. '\n')
       os.execute([[
         sh -c "source ci/common/test.sh
         check_core_dumps --delete \"]] .. Paths.test_luajit_prg .. [[\""]])
     else
-      error(emsg)
+      error(tostring(emsg)..'\nexit code: '..status)
+    end
+  elseif status ~= 0 then
+    if not allow_failure then
+      error("child process errored out with status "..status.."!\n\n"..location)
     end
   end
 end
@@ -758,6 +728,11 @@ local function gen_itp(it)
       -- FIXME Fix tests with this true
       return
     end
+
+    -- Pre-emptively calculating error location, wasteful, ugh!
+    -- But the way this code messes around with busted implies the real location is strictly
+    -- not available in the parent when an actual error occurs. so we have to do this here.
+    local location = debug.traceback()
     it(name, function()
       local rd, wr = sc.pipe()
       child_pid = sc.fork()
@@ -768,7 +743,7 @@ local function gen_itp(it)
         sc.close(wr)
         local saved_child_pid = child_pid
         child_pid = nil
-        itp_parent(rd, saved_child_pid, allow_failure)
+        itp_parent(rd, saved_child_pid, allow_failure, location)
       end
     end)
   end

test/unit/tui_spec.lua

@@ -9,6 +9,7 @@ local cinput = cimport("./src/nvim/tui/input.h")
 local rbuffer = cimport("./test/unit/fixtures/rbuffer.h")
 local globals = cimport("./src/nvim/globals.h")
 local multiqueue = cimport("./test/unit/fixtures/multiqueue.h")
+local ui_client = cimport("./src/nvim/ui_client.h")
 
 itp('handle_background_color', function()
   local handle_background_color = cinput.ut_handle_background_color
@@ -34,10 +35,8 @@ itp('handle_background_color', function()
     eq(kComplete, handle_background_color(term_input))
     eq(0, term_input.waiting_for_bg_response)
     eq(0, multiqueue.multiqueue_size(events))
-
+    eq(bg, ({[0]="light", [1] = "dark", [-1] = "none"})
-    local event = multiqueue.multiqueue_get(events)
+           [tonumber(ui_client.ui_client_bg_response)])
-    local bg_event = ffi.cast("Event*", event.argv[1])
-    eq(bg, ffi.string(bg_event.argv[0]))
 
     -- Buffer has been consumed.
     eq(0, rbuf.size)
@@ -114,9 +113,7 @@ itp('handle_background_color', function()
   eq(kComplete, handle_background_color(term_input))
   eq(0, term_input.waiting_for_bg_response)
 
-  local event = multiqueue.multiqueue_get(events)
+  eq(0, tonumber(ui_client.ui_client_bg_response))
-  local bg_event = ffi.cast("Event*", event.argv[1])
-  eq('light', ffi.string(bg_event.argv[0]))
   eq(0, multiqueue.multiqueue_size(events))
   eq(0, rbuf.size)
 
@@ -133,9 +130,7 @@ itp('handle_background_color', function()
   eq(kComplete, handle_background_color(term_input))
   eq(0, term_input.waiting_for_bg_response)
 
-  event = multiqueue.multiqueue_get(events)
+  eq(0, tonumber(ui_client.ui_client_bg_response))
-  bg_event = ffi.cast("Event*", event.argv[1])
-  eq('light', ffi.string(bg_event.argv[0]))
   eq(0, multiqueue.multiqueue_size(events))
   eq(0, rbuf.size)
 
@@ -161,7 +156,7 @@ itp('handle_background_color', function()
   eq(kComplete, handle_background_color(term_input))
   eq(0, term_input.waiting_for_bg_response)
 
-  eq(1, multiqueue.multiqueue_size(events))
+  eq(0, multiqueue.multiqueue_size(events))
   eq(3, rbuf.size)
   rbuffer.rbuffer_consumed(rbuf, rbuf.size)
 end)