From bb11006f635a69dd9244e09e4359ed02eff8fe84 Mon Sep 17 00:00:00 2001
From: Benoit Germain <benoit.germain@ubisoft.com>
Date: Mon, 29 Jul 2024 18:07:16 +0200
Subject: Internal refactorization to properly handle lua_resume idiosyncrasies

---
 tests/cancel.lua     | 2 +-
 tests/error.lua      | 9 +++++----
 tests/finalizer.lua  | 4 ++++
 tests/tobeclosed.lua | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/cancel.lua b/tests/cancel.lua
index 8dfccd2..1984c85 100644
--- a/tests/cancel.lua
+++ b/tests/cancel.lua
@@ -72,7 +72,7 @@ local waitCancellation = function( h, expected_status)
 		until h.status ~= "running"
 	end
 	print( "lane status:", h.status)
-	assert( h.status == expected_status, h.status .. " ~= " .. expected_status)
+	assert( h.status == expected_status, "lane status " .. h.status .. " (actual) ~= " .. expected_status .. " (expected)")
 	print "test OK"
 end
 
diff --git a/tests/error.lua b/tests/error.lua
index 126161e..a1ba1ce 100644
--- a/tests/error.lua
+++ b/tests/error.lua
@@ -95,12 +95,12 @@ local make_table_error_mt = function()
 end
 
 local lane_error_as_string = "'lane error as string'"
-local lane_error_as_table = setmetatable({}, make_table_error_mt())
+local lane_error_as_table = setmetatable({"lane error as table"}, make_table_error_mt())
 local lane_error_as_linda = lanes.linda("'lane error'")
 
-local finalizer_error_as_string = "'lane error as string'"
-local finalizer_error_as_table = setmetatable({}, make_table_error_mt())
-local finalizer_error_as_linda = lanes.linda("'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 test_settings = {}
 local configure_tests = function()
@@ -150,6 +150,7 @@ local configure_tests = function()
             end
         end
     end
+    WR "Tests configured"
 end
 
 configure_tests()
diff --git a/tests/finalizer.lua b/tests/finalizer.lua
index 1412a67..8bf89b4 100644
--- a/tests/finalizer.lua
+++ b/tests/finalizer.lua
@@ -39,6 +39,7 @@ local function lane(error_)
         error(error_, 0)    -- exception here; the value needs NOT be a string
     end
     -- no exception
+    io.stderr:write("Lane completed\n")
     return true
 end
 
@@ -81,10 +82,13 @@ local do_test = function(error_)
         assert(stack, "no stack trace on error, check 'error_trace_level'")
         io.stderr:write( "Lane error: "..tostring(err).."\n" )
         io.stderr:write( "\t", table.concat(stack,"\t\n"), "\n" )
+    else
+        io.stderr:write( "Done\n" )
     end
 end
 
 do_test(nil)
+-- do return end
 do_test("An error")
 
 local on_exit = function()
diff --git a/tests/tobeclosed.lua b/tests/tobeclosed.lua
index 5ac8ab7..7a5e3ae 100644
--- a/tests/tobeclosed.lua
+++ b/tests/tobeclosed.lua
@@ -83,6 +83,7 @@ do
     local lane_body = function()
         WR "In lane body"
         lanes.sleep(1)
+        return "success"
     end
 
     local h = lanes.gen("*", lane_body)()
@@ -90,6 +91,7 @@ do
         local tobeclosed <close> = h
     end
     assert(h.status == "done")
+    return "success"
 end
 
 -- #################################################################################################
-- 
cgit v1.2.3-55-g6feb