Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests on Windows #251

Merged
merged 3 commits into from
Mar 7, 2022
Merged

Fix tests on Windows #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
899b4ff
Fix tests on Windows
talex5 Feb 28, 2022
173161c
Treat EPIPE and ECONNRESET as EOF
talex5 Mar 7, 2022
bc7afa1
Handle different "disconnected" errors in unit tests
talex5 Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions test-lwt/test_lwt.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ let ensure_removed path =
try Unix.unlink path
with Unix.Unix_error(Unix.ENOENT, _, _) -> ()

let next_port = ref 8000

let get_test_address ~switch name =
match Sys.os_type with
| "Win32" ->
(* No Unix-domain sockets on Windows *)
let port = !next_port in
incr next_port;
`TCP ("127.0.0.1", port)
| _ ->
let socket_path = Filename.(concat (Filename.get_temp_dir_name ())) name in
Lwt_switch.add_hook (Some switch) (fun () -> Lwt.return @@ ensure_removed socket_path);
`Unix socket_path

(* Have the client ask the server for its bootstrap object, and return the
resulting client-side proxy to it. *)
let get_bootstrap cs =
Expand Down Expand Up @@ -59,9 +73,8 @@ let server_pem = `PEM (Auth.Secret_key.to_pem_data server_key)

let make_vats_full ?(serve_tls=false) ~client_switch ~server_switch ~restore () =
let server_config =
let socket_path = Filename.(concat (Filename.get_temp_dir_name ())) "capnp-rpc-test-server" in
Lwt_switch.add_hook (Some server_switch) (fun () -> Lwt.return @@ ensure_removed socket_path);
Capnp_rpc_unix.Vat_config.create ~secret_key:server_pem ~serve_tls (`Unix socket_path)
let addr = get_test_address ~switch:server_switch "capnp-rpc-test-server" in
Capnp_rpc_unix.Vat_config.create ~secret_key:server_pem ~serve_tls addr
in
Capnp_rpc_unix.serve ~switch:server_switch ~tags:Test_utils.server_tags ~restore server_config >>= fun server ->
Lwt.return {
Expand Down Expand Up @@ -342,6 +355,7 @@ let expect_non_exn = function
| Error ex -> Alcotest.failf "expect_non_exn: %a" Capnp_rpc.Exception.pp ex

let except = Alcotest.testable Capnp_rpc.Exception.pp (=)
let except_ty = Alcotest.testable Capnp_rpc.Exception.pp_ty (=)

let test_table_restorer _switch =
let make_sturdy id = Uri.make ~path:(Restorer.Id.to_string id) () in
Expand Down Expand Up @@ -458,8 +472,7 @@ let test_broken switch =
Logs.info (fun f -> f "Turning off server...");
Lwt_switch.turn_off cs.server_switch >>= fun () ->
problem >>= fun problem ->
let expected = Exception.v ~ty:`Disconnected "Vat shut down" in
Alcotest.check except "Broken callback ran" expected problem;
Alcotest.check except_ty "Broken callback ran" `Disconnected problem.ty;
assert (Capability.problem service <> None);
Lwt.catch
(fun () -> Echo.ping service "ping" >|= fun _ -> Alcotest.fail "Should have failed!")
Expand Down Expand Up @@ -537,9 +550,7 @@ let test_crossed_calls switch =
let config =
let secret_key = `PEM (Auth.Secret_key.to_pem_data secret_key) in
let name = Fmt.str "capnp-rpc-test-%s" addr in
let socket_path = Filename.(concat (Filename.get_temp_dir_name ())) name in
Lwt_switch.add_hook (Some switch) (fun () -> Lwt.return @@ ensure_removed socket_path);
Capnp_rpc_unix.Vat_config.create ~secret_key (`Unix socket_path)
Capnp_rpc_unix.Vat_config.create ~secret_key (get_test_address ~switch name)
in
Capnp_rpc_unix.serve ~switch ~tags ~restore config >>= fun vat ->
Lwt_switch.add_hook (Some switch) (fun () -> Capability.dec_ref service; Lwt.return_unit);
Expand Down Expand Up @@ -596,9 +607,10 @@ let test_crossed_calls _switch =
let test_store switch =
(* Persistent server configuration *)
let db = Store.DB.create () in
let socket_path = Filename.(concat (Filename.get_temp_dir_name ())) "capnp-rpc-test-server" in
Lwt_switch.add_hook (Some switch) (fun () -> Lwt.return @@ ensure_removed socket_path);
let config = Capnp_rpc_unix.Vat_config.create ~secret_key:server_pem (`Unix socket_path) in
let config =
let addr = get_test_address ~switch "capnp-rpc-test-server" in
Capnp_rpc_unix.Vat_config.create ~secret_key:server_pem addr
in
let main_id = Restorer.Id.generate () in
let start_server ~switch () =
let make_sturdy = Capnp_rpc_unix.Vat_config.sturdy_uri config in
Expand Down
5 changes: 4 additions & 1 deletion unix/unix_flow.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ let write t buf =
Lwt.catch
(fun () -> aux buf)
(function
| Unix.Unix_error (Unix.ECONNRESET, _, _)
| Unix.Unix_error (Unix.EPIPE, _, _) -> Lwt.return @@ Error `Closed
| ex -> Lwt.return @@ Error (`Exception ex))

Expand Down Expand Up @@ -77,7 +78,9 @@ let read t =
Lwt.return @@ Ok (`Data (Cstruct.sub buf 0 got))
)
(function
| Lwt.Canceled -> Lwt.return @@ Ok `Eof
| Lwt.Canceled
| Unix.Unix_error (Unix.EPIPE, _, _)
| Unix.Unix_error (Unix.ECONNRESET, _, _) -> Lwt_result.return `Eof
| ex -> Lwt.return @@ Error (`Exception ex)
)

Expand Down