fix(job): remove delay from shutdown (#406)

Author: marcuscaisey

lua/plenary/job.lua

@@ -211,10 +211,9 @@ end
 
 --- Shutdown a job.
 function Job:shutdown(code, signal)
-  if self._shutdown_check and not uv.is_active(self._shutdown_check) then
-    vim.wait(1000, function()
-      return self:_pipes_are_closed(self) and self.is_shutdown
-    end, 1, true)
+  if self._shutdown_check and uv.is_active(self._shutdown_check) then
+    -- shutdown has already started
+    return
   end
 
   self:_shutdown(code, signal)

tests/plenary/job_spec.lua

@@ -10,6 +10,27 @@ local has_all_executables = function(execs)
   return true
 end
 
+local tables_equal = function(t1, t2)
+  if #t1 ~= #t2 then
+    return false
+  end
+  for i, t1_v in ipairs(t1) do
+    if t2[i] ~= t1_v then
+      return false
+    end
+  end
+  return true
+end
+
+local wait_for_result = function(job, result)
+  if type(result) == "string" then
+    result = { result }
+  end
+  vim.wait(1000, function()
+    return tables_equal(job:result(), result)
+  end)
+end
+
 describe("Job", function()
   describe("> cat manually >", function()
     it("should split simple stdin", function()
@@ -25,6 +46,8 @@ describe("Job", function()
       job:start()
       job:send "hello\n"
       job:send "world\n"
+
+      wait_for_result(job, { "hello", "world" })
       job:shutdown()
 
       assert.are.same(job:result(), { "hello", "world" })
@@ -46,6 +69,8 @@ describe("Job", function()
       job:send "\n"
       job:send "world\n"
       job:send "\n"
+
+      wait_for_result(job, { "hello", "", "world", "" })
       job:shutdown()
 
       assert.are.same(job:result(), { "hello", "", "world", "" })
@@ -66,6 +91,8 @@ describe("Job", function()
       job:start()
       job:send "hello\nwor"
       job:send "ld\n"
+
+      wait_for_result(job, { "hello", "world" })
       job:shutdown()
 
       assert.are.same(job:result(), { "hello", "world" })
@@ -655,6 +682,7 @@ describe("Job", function()
       input_pipe:write "job.lua\n"
       input_pipe:close()
 
+      wait_for_result(fzf, "job.lua")
       fzf:shutdown()
 
       local results = fzf:result()
@@ -692,6 +720,7 @@ describe("Job", function()
       input_pipe:write "job.lua"
       input_pipe:close()
 
+      wait_for_result(fzf, "job.lua")
       fzf:shutdown()
 
       local results = fzf:result()