From 5c0a12d4d1269e690a4b673cec9a95d0bb13dd9d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 16 Mar 2018 22:26:15 +0000 Subject: util.async: Ensure runner is left in correct state after out-of-main-loop error (+tests) --- spec/util_async_spec.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'spec/util_async_spec.lua') diff --git a/spec/util_async_spec.lua b/spec/util_async_spec.lua index 67438595..bc6e04f8 100644 --- a/spec/util_async_spec.lua +++ b/spec/util_async_spec.lua @@ -35,9 +35,14 @@ describe("util.async", function() describe("#errors", function () local last_processed_item, last_error; local r; + local wait, done; r = async.runner(function (item) if item == "error" then error({ e = "test error" }); + elseif item == "wait" then + wait, done = async.waiter(); + wait(); + error({ e = "post wait error" }); end last_processed_item = item; end, { @@ -81,6 +86,24 @@ describe("util.async", function() assert.equal(r.state, "ready"); assert.equal(last_processed_item, "world"); end); + it("should work despite a #waiter", function () + -- This test covers an important case where a runner + -- throws an error while being executed outside of the + -- main loop. This happens when it was blocked ('waiting'), + -- and then released (via a call to done()). + last_error = nil; + r:run("wait"); + assert.equal(r.state, "waiting"); + done(); + -- At this point an error happens (state goes error->ready) + assert.equal(r.state, "ready"); + assert.is_table(last_error); + assert.equal(last_error.e, "post wait error"); + last_error = nil; + r:run("hello again"); + assert.equal(r.state, "ready"); + assert.equal(last_processed_item, "hello again"); + end); end); end); describe("#waiter", function() -- cgit v1.2.3