remove test-only primitive

raphael-proust · raphael-proust · commit e266af5ff23f · 2025-06-24T14:39:54.000+02:00
diff --git a/src/unix/lwt_unix.cppo.ml b/src/unix/lwt_unix.cppo.ml
@@ -247,22 +247,7 @@ let self_result job =
   with exn when Lwt.Exception_filter.run exn ->
     Result.Error exn
 
-let in_retention_test = ref false
-
-let retained o =
-  let retained = ref true in
-  Gc.finalise (fun _ ->
-    if !in_retention_test then
-      retained := false)
-    o;
-  in_retention_test := true;
-  retained
-
 let run_job ?async_method job =
-  if !in_retention_test then begin
-    Gc.full_major ();
-    in_retention_test := false
-  end;
   let async_method = choose_async_method async_method in
   if async_method = Async_none then
     try
diff --git a/src/unix/lwt_unix.cppo.mli b/src/unix/lwt_unix.cppo.mli
@@ -1581,9 +1581,6 @@ val somaxconn : unit -> int
   [@@ocaml.deprecated " This is an internal function."]
   (** @deprecated This is for internal use only. *)
 
-val retained : 'a -> bool ref
-  (** @deprecated Used for testing. *)
-
 val read_bigarray :
   string -> file_descr -> IO_vectors._bigarray -> int -> int -> int Lwt.t
   [@@ocaml.deprecated " This is an internal function."]
diff --git a/test/unix/test_lwt_bytes.ml b/test/unix/test_lwt_bytes.ml
@@ -597,23 +597,6 @@ let suite = suite "lwt_bytes" [
       Lwt.return check
     end;
 
-    test "read: buffer retention" ~sequential:true begin fun () ->
-      let buffer = Lwt_bytes.create 3 in
-
-      let read_fd, write_fd = Lwt_unix.pipe ~cloexec:true () in
-      Lwt_unix.set_blocking read_fd true;
-
-      Lwt_unix.write_string write_fd "foo" 0 3 >>= fun _ ->
-
-      let retained = Lwt_unix.retained buffer in
-      Lwt_bytes.read read_fd buffer 0 3 >>= fun _ ->
-
-      Lwt_unix.close write_fd >>= fun () ->
-      Lwt_unix.close read_fd >|= fun () ->
-
-      !retained
-    end;
-
     test "bytes write" begin fun () ->
       let test_file = "bytes_io_data_write" in
       Lwt_unix.openfile test_file [O_RDWR;O_TRUNC; O_CREAT] 0o666
@@ -634,21 +617,6 @@ let suite = suite "lwt_bytes" [
       Lwt.return check
     end;
 
-    test "write: buffer retention" ~sequential:true begin fun () ->
-      let buffer = Lwt_bytes.create 3 in
-
-      let read_fd, write_fd = Lwt_unix.pipe ~cloexec:true () in
-      Lwt_unix.set_blocking write_fd true;
-
-      let retained = Lwt_unix.retained buffer in
-      Lwt_bytes.write write_fd buffer 0 3 >>= fun _ ->
-
-      Lwt_unix.close write_fd >>= fun () ->
-      Lwt_unix.close read_fd >|= fun () ->
-
-      !retained
-    end;
-
     test "bytes recv" ~only_if:(fun () -> not Sys.win32) begin fun () ->
       let buf = gen_buf 6 in
       let server_logic socket =
diff --git a/test/unix/test_lwt_unix.ml b/test/unix/test_lwt_unix.ml
@@ -453,12 +453,14 @@ let readv_tests =
 
       Lwt_unix.write_string write_fd "foo" 0 3 >>= fun _ ->
 
-      let retained = Lwt_unix.retained io_vectors in
+      let retained = ref true in
+      Gc.finalise (fun _ -> retained := false) io_vectors;
       Lwt_unix.readv read_fd io_vectors >>= fun _ ->
 
       Lwt_unix.close write_fd >>= fun () ->
       Lwt_unix.close read_fd >|= fun () ->
 
+      Gc.full_major ();
       !retained
     end;
 
@@ -621,12 +623,14 @@ let writev_tests =
       let read_fd, write_fd = Lwt_unix.pipe ~cloexec:true () in
       Lwt_unix.set_blocking write_fd true;
 
-      let retained = Lwt_unix.retained io_vectors in
+      let retained = ref true in
+      Gc.finalise (fun _ -> retained := false) io_vectors;
       Lwt_unix.writev write_fd io_vectors >>= fun _ ->
 
       Lwt_unix.close write_fd >>= fun () ->
       Lwt_unix.close read_fd >|= fun () ->
 
+      Gc.full_major ();
       !retained
     end;
 
