1 files changed, 14 insertions, 8 deletions

diff --git a/unit_tests/scripts/lane/cooperative_shutdown.lua b/unit_tests/scripts/lane/cooperative_shutdown.lua
index 1204e35..0a0943e 100644
--- a/unit_tests/scripts/lane/cooperative_shutdown.lua
+++ b/unit_tests/scripts/lane/cooperative_shutdown.lua
@@ -1,10 +1,10 @@
-local lanes = require "lanes"
+local lanes = require "lanes".configure{on_state_create = require "fixture".on_state_create}
 
 -- launch lanes that cooperate properly with cancellation request
 
 local lane1 = function()
         lane_threadname("lane1")
-        -- loop breaks on cancellation request
+        -- loop breaks on soft cancellation request
         repeat
                 lanes.sleep(0)
         until cancel_test()
@@ -23,7 +23,6 @@ end
 local lane3 = function()
         lane_threadname("lane3")
         -- this one cooperates too, because of the hook cancellation modes that Lanes will be using
-        -- but not with LuaJIT, because the function is compiled, and we don't call anyone, so no hook triggers
         local fixture = require "fixture"
         repeat until fixture.give_me_back(false)
 end
@@ -31,9 +30,9 @@ end
 
 
 -- the generators
-local g1 = lanes.gen("*", lane1)
-local g2 = lanes.gen("*", lane2)
-local g3 = lanes.gen("*", lane3)
+local g1 = lanes.gen("*", { name = 'auto' }, lane1)
+local g2 = lanes.gen("*", { name = 'auto' }, lane2)
+local g3 = lanes.gen("*", { name = 'auto' }, lane3)
 
 -- launch lanes
 local h1 = g1()
@@ -43,7 +42,14 @@ local h2 = g2(linda)
 
 local h3 = g3()
 
--- wait until they are both started
-repeat until h1.status == "running" and h2.status == "waiting" and h3.status == "running"
+lanes.sleep(0.1)
+
+local is_running = function(lane_h)
+        local status = lane_h.status
+        return status == "running" or status == "waiting"
+end
+
+-- wait until they are all started
+repeat until is_running(h1) and is_running(h2) and is_running(h3)
 
 -- let the script terminate, Lanes should not crash at shutdown