1 files changed, 5 insertions, 6 deletions

diff --git a/tests/error.lua b/tests/error.lua
index 306c51d..76ceea4 100644
--- a/tests/error.lua
+++ b/tests/error.lua
@@ -106,11 +106,11 @@ end
 

 local lane_error_as_string = "'lane error as string'"

 local lane_error_as_table = setmetatable({"lane error as table"}, make_table_error_mt())

-local lane_error_as_linda = lanes.linda("'lane error'")

+local lane_error_as_linda = lanes.linda{name = "'lane error'"}

 

 local finalizer_error_as_string = "'finalizer error as string'"

 local finalizer_error_as_table = setmetatable({"finalizer error as table"}, make_table_error_mt())

-local finalizer_error_as_linda = lanes.linda("'finalizer error'")

+local finalizer_error_as_linda = lanes.linda{name = "'finalizer error'"}

 

 local test_settings = {}

 local configure_tests = function()

@@ -173,8 +173,7 @@ local do_error_catching_test = function(error_reporting_mode_, error_value_, fin
     local h = start_lane(error_reporting_mode_, error_value_, finalizer_, finalizer_error_value_)

     local ret,err,stack= h:join()   -- wait for the lane (no automatic error propagation)

     WR("Processing results for {", error_reporting_mode_, error_value_, finalizer_, finalizer_error_value_, "}")

-    if err then

-        assert(ret == nil)

+    if ret == nil then

         assert(error_reporting_mode_ == "minimal" or type(stack)=="table") -- only true if lane was configured with error_trace_level ~= "minimal"

         if err == error_value_ then

             WR("Lane regular error: ", err)

@@ -198,8 +197,8 @@ local do_error_catching_test = function(error_reporting_mode_, error_value_, fin
             end

         end

     else -- no error

-        assert(ret == "success")

-        WR("No error in lane: ", ret)

+        assert(ret == true and err == "success")

+        WR("No error in lane: ", err, ret)

     end

     WR "TEST OK"

 end