From e71f3698e8a1ea3cb21c0f83190364ccef95b2ba Mon Sep 17 00:00:00 2001 From: Vivien Date: Tue, 13 Jun 2023 10:54:20 +0200 Subject: [PATCH 1/2] p2p/test: prevent double close of pipes in test using fork processes --- src/lib_p2p/test/common/process.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib_p2p/test/common/process.ml b/src/lib_p2p/test/common/process.ml index 9e46e7b876bd..4d49b8ed22e9 100644 --- a/src/lib_p2p/test/common/process.ml +++ b/src/lib_p2p/test/common/process.ml @@ -199,9 +199,9 @@ let detach ?(prefix = "") ?canceler ?input_encoding ?output_encoding protect ~canceler (fun () -> - let main_in, child_out = Lwt_io.pipe ~cloexec:true () in - let child_in, main_out = Lwt_io.pipe ~cloexec:true () in - let main_result, child_exit = Lwt_io.pipe ~cloexec:true () in + let main_in, child_out = Lwt_io.pipe () in + let child_in, main_out = Lwt_io.pipe () in + let main_result, child_exit = Lwt_io.pipe () in match Lwt_unix.fork () with | 0 -> (* I am the child process. *) -- GitLab From 307b4f564f8826d5baa5a1e1fd86c72fa0e26996 Mon Sep 17 00:00:00 2001 From: Vivien Date: Tue, 13 Jun 2023 17:12:34 +0200 Subject: [PATCH 2/2] p2p/test: reactivate p2p socket self conn msg --- src/lib_p2p/tezt/test_p2p_socket.ml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/lib_p2p/tezt/test_p2p_socket.ml b/src/lib_p2p/tezt/test_p2p_socket.ml index ebbe53c134f9..5c3800215175 100644 --- a/src/lib_p2p/tezt/test_p2p_socket.ml +++ b/src/lib_p2p/tezt/test_p2p_socket.ml @@ -157,16 +157,7 @@ module Self_identification = struct Test.register ~__FILE__ ~title:"p2p socket self connection message" - ~tags: - [ - "p2p"; - "socket"; - "self_identification"; - (* FIXME: https://gitlab.com/tezos/tezos/-/issues/5868 - - This test is flaky and has been disabled. *) - "ci_disable"; - ] + ~tags:["p2p"; "socket"; "self_identification"] @@ fun () -> let server _ch sched socket = let open Lwt_result_syntax in -- GitLab