Avoid raw Fiber.spawn in tests

ocaml-multicore · Jul 16, 2024 · f171b50 · f171b50
1 parent bed8290
commit f171b50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/test/dune b/test/dune
@@ -144,7 +144,7 @@
 (test
  (name test_schedulers)
  (modules test_schedulers)
- (libraries picos test_scheduler alcotest))
+ (libraries picos picos.structured test_scheduler alcotest))
 
 ;;
 

diff --git a/test/test_schedulers.ml b/test/test_schedulers.ml
@@ -1,4 +1,5 @@
 open Picos
+open Picos_structured
 
 let exit_exn_bt = Exn_bt.get_callstack 0 Exit
 
@@ -10,15 +11,10 @@ let test_current () =
   Test_scheduler.run ~max_domains:2 @@ fun () ->
   let fiber_parent = Fiber.current () in
   let fiber_child = ref fiber_parent in
-  let computation = Computation.create () in
-  Fiber.spawn ~forbid:false computation
-    [
-      (fun () ->
-        Computation.cancel computation exit_exn_bt;
-        fiber_child := Fiber.current ());
-    ];
+  Bundle.join_after @@ fun bundle ->
+  Bundle.fork bundle (fun () -> fiber_child := Fiber.current ());
   while fiber_parent == !fiber_child do
-    Fiber.yield ()
+    Control.yield ()
   done
 
 let test_cancel_after_basic () =