test(watcher): enable running on macos

they still aren't working well, but at least they're running.

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

src/dune_file_watcher/dune_file_watcher.ml

@@ -509,17 +509,6 @@ let add_watch t path =
     ()
   | Inotify inotify -> Inotify_lib.add inotify (Path.to_string path)
 
-module For_tests = struct
-  let pid t =
-    match t.kind with
-    | Fswatch c -> c.pid
-    | _ -> failwith "pid unavailable"
-
-  let suspend t = Unix.kill (Pid.to_int (pid t)) Sys.sigstop
-
-  let resume t = Unix.kill (Pid.to_int (pid t)) Sys.sigcont
-end
-
 let ignore_next_file_change_event t path =
   assert (Path.is_in_source_tree path);
   Table.set t.ignored_files (Path.to_absolute_filename path) ()

src/dune_file_watcher/dune_file_watcher.mli

@@ -72,12 +72,6 @@ val wait_for_initial_watches_established_blocking : t -> unit
     far. *)
 val emit_sync : unit -> unit
 
-module For_tests : sig
-  val suspend : t -> unit
-
-  val resume : t -> unit
-end
-
 val add_watch : t -> Path.t -> unit
 
 (** Ignore the ne next file change event about this file. *)

test/expect-tests/dune_file_watcher/dune

@@ -7,7 +7,8 @@
  (name dune_file_watcher_tests_macos)
  (modules dune_file_watcher_tests_macos)
  (inline_tests
-  (enabled_if (= %{system} macosx))
+  (enabled_if
+   (= %{system} macosx))
   (deps
    (sandbox always)))
  (libraries

test/expect-tests/dune_file_watcher/dune_file_watcher_tests_macos.ml

@@ -39,30 +39,27 @@ let%expect_test _ =
   Dune_file_watcher.wait_for_initial_watches_established_blocking watcher;
   Stdio.Out_channel.write_all "x" ~data:"x";
   print_events 1;
-  [%expect {|
+  [%expect
+    {|
     { path = In_source_tree "."; kind = "Created" }
     { path = In_source_tree "x"; kind = "Unknown" }
     Got more events than expected: expected 1, saw 2 |}];
   Unix.rename "x" "y";
   print_events 0;
   [%expect {|
 |}];
-  Dune_file_watcher.For_tests.suspend watcher;
   let (_ : _) = Fpath.mkdir_p "d/w" in
   Stdio.Out_channel.write_all "d/w/x" ~data:"x";
-  Dune_file_watcher.For_tests.resume watcher;
   print_events 0;
-  [%expect.unreachable];
+  [%expect {||}];
   Stdio.Out_channel.write_all "d/w/y" ~data:"y";
   print_events 1;
-  [%expect.unreachable]
-[@@expect.uncaught_exn {|
-  (* CR expect_test_collector: This test expectation appears to contain a backtrace.
-     This is strongly discouraged as backtraces are fragile.
-     Please change this test to not include a backtrace. *)
-
-  (Failure "pid unavailable")
-  Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33
-  Called from Dune_file_watcher.For_tests.suspend in file "src/dune_file_watcher/dune_file_watcher.ml", line 518, characters 40-47
-  Called from Dune_file_watcher_tests_macos.(fun) in file "test/expect-tests/dune_file_watcher/dune_file_watcher_tests_macos.ml", line 47, characters 2-45
-  Called from Expect_test_collector.Make.Instance.exec in file "collector/expect_test_collector.ml", line 244, characters 12-19 |}]
+  [%expect
+    {|
+    { path = In_source_tree "x"; kind = "Unknown" }
+    { path = In_source_tree "y"; kind = "Unknown" }
+    { path = In_source_tree "d"; kind = "Created" }
+    { path = In_source_tree "d/w"; kind = "Created" }
+    { path = In_source_tree "d/w/x"; kind = "Unknown" }
+    { path = In_source_tree "d/w/y"; kind = "Unknown" }
+    Got more events than expected: expected 1, saw 6 |}]