Make alcotest-lwt compatible with jsoo

src/alcotest-lwt/dune

@@ -7,5 +7,4 @@
   fmt
   alcotest.engine
   alcotest
-  (re_export lwt.unix) ;; Unused dependency added for convenience to consumers
   ))

test/e2e/alcotest-lwt/failing/async_failure-js.expected

@@ -0,0 +1,16 @@
+Testing `test/e2e/alcotest-lwt/failing/async_failure.ml'.
+This run has ID `<uuid>'.
+
+> [FAIL]        all          0   one.
+  [OK]          all          1   two.
+
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ [FAIL]        all          0   one.                                          │
+└──────────────────────────────────────────────────────────────────────────────┘
+freeing all resources
+[failure] All is broken
+Logs saved to `<build-context>/_build/_tests/<test-dir>/all.000.output'.
+ ──────────────────────────────────────────────────────────────────────────────
+
+Full test results in `<build-context>/_build/_tests/<test-dir>'.
+1 failure! in <test-duration>s. 2 tests run.

test/e2e/alcotest-lwt/failing/async_failure.ml

@@ -5,11 +5,11 @@ let free () =
 let test_lwt switch () =
   Lwt_switch.add_hook (Some switch) free;
   Lwt.async (fun () -> failwith "All is broken");
-  Lwt_unix.sleep 10.
+  Lwt.pause ()
 
 let () =
   let open Alcotest_lwt in
-  Lwt_main.run
+  Alcotest_test_helper.wakeup_until_resolved
   @@ run __FILE__
        [
          ( "all",

test/e2e/alcotest-lwt/failing/dune

@@ -18,7 +18,8 @@
     --package
     "alcotest-lwt"
     --libraries
-    "alcotest-lwt lwt lwt.unix"))))
+    "alcotest-lwt lwt alcotest_test_helper"
+    --js))))
 
 (rule
  (alias runtest)

test/e2e/alcotest-lwt/failing/dune.inc

@@ -3,8 +3,8 @@
    async_failure
    fail_with
  )
- (libraries alcotest alcotest.stdlib_ext alcotest-lwt lwt lwt.unix)
- (modes native)
+ (libraries alcotest alcotest.stdlib_ext alcotest-lwt lwt alcotest_test_helper)
+ (modes native js)
  (modules
    async_failure
    fail_with
@@ -30,6 +30,25 @@
  (action
    (diff async_failure.expected async_failure.processed)))
 
+(rule
+ (target async_failure-js.actual)
+ (action
+  (with-outputs-to %{target}
+   (with-accepted-exit-codes (or 1 2 125)
+    (run node %{dep:async_failure.bc.js})))))
+
+(rule
+ (target async_failure-js.processed)
+ (action
+  (with-outputs-to %{target}
+   (run ../../strip_randomness.exe %{dep:async_failure-js.actual}))))
+
+(rule
+ (alias runtest-js)
+ (package alcotest-lwt)
+ (action
+   (diff async_failure-js.expected async_failure-js.processed)))
+
 (rule
  (target fail_with.actual)
  (action
@@ -48,3 +67,22 @@
  (package alcotest-lwt)
  (action
    (diff fail_with.expected fail_with.processed)))
+
+(rule
+ (target fail_with-js.actual)
+ (action
+  (with-outputs-to %{target}
+   (with-accepted-exit-codes (or 1 2 125)
+    (run node %{dep:fail_with.bc.js})))))
+
+(rule
+ (target fail_with-js.processed)
+ (action
+  (with-outputs-to %{target}
+   (run ../../strip_randomness.exe %{dep:fail_with-js.actual}))))
+
+(rule
+ (alias runtest-js)
+ (package alcotest-lwt)
+ (action
+   (diff fail_with-js.expected fail_with-js.processed)))

test/e2e/alcotest-lwt/failing/fail_with-js.expected

@@ -0,0 +1,15 @@
+Testing `test/e2e/alcotest-lwt/failing/fail_with.ml'.
+This run has ID `<uuid>'.
+
+> [FAIL]        all          0   one.
+  [OK]          all          1   two.
+
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ [FAIL]        all          0   one.                                          │
+└──────────────────────────────────────────────────────────────────────────────┘
+[failure] should fail
+Logs saved to `<build-context>/_build/_tests/<test-dir>/all.000.output'.
+ ──────────────────────────────────────────────────────────────────────────────
+
+Full test results in `<build-context>/_build/_tests/<test-dir>'.
+1 failure! in <test-duration>s. 2 tests run.

test/e2e/alcotest-lwt/failing/fail_with.ml

@@ -2,7 +2,7 @@ let test_lwt _switch () = Lwt.fail_with "should fail"
 
 let () =
   let open Alcotest_lwt in
-  Lwt_main.run
+  Alcotest_test_helper.wakeup_until_resolved
   @@ run ~record_backtrace:false __FILE__
        [
          ( "all",

test/e2e/alcotest-lwt/passing/cli_options-js.expected

@@ -0,0 +1,8 @@
+Testing `Results should be in JSON, since --json is passed'.
+This run has ID `<uuid>'.
+
+{
+  "success": 1,
+  "failures": 0,
+  "time": <test-duration>
+}

test/e2e/alcotest-lwt/passing/cli_options.ml

@@ -1,5 +1,5 @@
 let () =
   let open Alcotest_lwt in
-  Lwt_main.run
+  Alcotest_test_helper.wakeup_until_resolved
   @@ run "Results should be in JSON, since --json is passed"
        [ ("test", [ test_case "alpha" `Quick (fun _ () -> Lwt.return_unit) ]) ]

test/e2e/alcotest-lwt/passing/dune

@@ -17,7 +17,8 @@
     --package
     "alcotest-lwt"
     --libraries
-    "alcotest-lwt lwt lwt.unix"))))
+    "alcotest-lwt lwt alcotest_test_helper"
+    --js))))
 
 (rule
  (alias runtest)

test/e2e/alcotest-lwt/passing/dune.inc

@@ -2,8 +2,8 @@
  (names
    cli_options
  )
- (libraries alcotest alcotest.stdlib_ext alcotest-lwt lwt lwt.unix)
- (modes native)
+ (libraries alcotest alcotest.stdlib_ext alcotest-lwt lwt alcotest_test_helper)
+ (modes native js)
  (modules
    cli_options
  )
@@ -27,3 +27,22 @@
  (package alcotest-lwt)
  (action
    (diff cli_options.expected cli_options.processed)))
+
+(rule
+ (target cli_options-js.actual)
+ (action
+  (with-outputs-to %{target}
+   (with-accepted-exit-codes (or 0 125)
+    (run node %{dep:cli_options.bc.js} --json)))))
+
+(rule
+ (target cli_options-js.processed)
+ (action
+  (with-outputs-to %{target}
+   (run ../../strip_randomness.exe %{dep:cli_options-js.actual}))))
+
+(rule
+ (alias runtest-js)
+ (package alcotest-lwt)
+ (action
+   (diff cli_options-js.expected cli_options-js.processed)))

test/e2e/helper/alcotest_test_helper.ml

@@ -0,0 +1,7 @@
+let rec wakeup_until_resolved p =
+  Lwt.wakeup_paused ();
+  match Lwt.poll p with
+  | Some x -> x
+  | None ->
+      if Lwt.paused_count () > 0 then wakeup_until_resolved p
+      else failwith "unresolved promise"

test/e2e/helper/dune

@@ -0,0 +1,3 @@
+(library
+  (name alcotest_test_helper)
+  (libraries lwt))