2 files changed, 16 insertions, 2 deletions

diff --git a/unit_tests/scripts/linda/send_receive_func_and_string.lua b/unit_tests/scripts/linda/send_receive_func_and_string.lua
new file mode 100644
index 0000000..188cfcd
--- /dev/null
+++ b/unit_tests/scripts/linda/send_receive_func_and_string.lua
@@ -0,0 +1,13 @@
+local lanes = require "lanes"
+
+-- a newly created linda doesn't contain anything
+local l = lanes.linda()
+
+-- send a function and a string, make sure that's what we read back
+l:send("k", function() end, "str")
+local c = l:count("k")
+assert(c == 2, "got " .. c)
+local k, v1, v2 = l:receive_batched("k", 2)
+local tv1, tv2 = type(v1), type(v2)
+assert(k == "k" and tv1 == "function" and tv2 == "string", "got " .. tv1 .. " " .. tv2)
+assert(l:count("k") == 0)
diff --git a/unit_tests/scripts/linda/wake_period.lua b/unit_tests/scripts/linda/wake_period.lua
index e4a900d..d2dccc3 100644
--- a/unit_tests/scripts/linda/wake_period.lua
+++ b/unit_tests/scripts/linda/wake_period.lua
@@ -6,7 +6,7 @@ local lanes = require_lanes_result_1
 local body = function(linda_)
         -- a blocking read that lasts longer than the tested wake_period values
         linda_:receive(2, "empty_slot")
-        return true
+        return "done"
 end
 
 -- if we don't cancel the lane, we should wait the whole duration
@@ -22,7 +22,8 @@ local function check_wake_duration(linda_, expected_, do_cancel_)
                 assert(result == false and reason == 'timeout', "unexpected cancel result")
         end
         -- this should wait until the linda wakes by itself before the actual receive timeout and sees the cancel request
-        h:join()
+        local r, ret = h:join()
+        assert(r == true and ret == "done")
         local t1 = lanes.now_secs()
         local delta = t1 - t0
         -- the linda should check for cancellation at about the expected period, not earlier