From 6e72402a0710fc8e15fe9d8f155dc62f892ba3d9 Mon Sep 17 00:00:00 2001 From: William Yang Date: Mon, 19 Feb 2024 15:56:22 +0100 Subject: [PATCH] test: fix some compiler warnings --- src/quicer_server_conn_callback.erl | 2 +- test/example_server_stream.erl | 4 +- test/prop_quicer_nif.erl | 4 +- test/prop_stateful_conn.erl | 2 +- test/quicer_echo_server_stream_callback.erl | 2 +- test/quicer_listener_SUITE.erl | 41 ++++++++++++--------- test/quicer_prop_gen.erl | 3 +- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/quicer_server_conn_callback.erl b/src/quicer_server_conn_callback.erl index d6331819..d2edc78b 100644 --- a/src/quicer_server_conn_callback.erl +++ b/src/quicer_server_conn_callback.erl @@ -94,7 +94,7 @@ new_stream( ok -> {ok, CBState#{streams := [{StreamOwner, Stream} | Streams]}}; {error, _} = E -> - {stop, {shutdown, handoff}, CBState} + {stop, {shutdown, {handoff, E}, CBState}} end; Other -> Other diff --git a/test/example_server_stream.erl b/test/example_server_stream.erl index 8a1a3632..6035b13b 100644 --- a/test/example_server_stream.erl +++ b/test/example_server_stream.erl @@ -39,7 +39,7 @@ -include("quicer.hrl"). -include_lib("snabbkaffe/include/snabbkaffe.hrl"). -init_handoff(Stream, StreamOpts, Conn, #{flags := Flags}) -> +init_handoff(Stream, _StreamOpts, Conn, #{flags := Flags}) -> InitState = #{ stream => Stream, conn => Conn, @@ -47,7 +47,7 @@ init_handoff(Stream, StreamOpts, Conn, #{flags := Flags}) -> is_local => false, is_unidir => quicer:is_unidirectional(Flags) }, - % ct:pal("init_handoff ~p", [{InitState, StreamOpts}]), + % ct:pal("init_handoff ~p", [{InitState, _StreamOpts}]), {ok, InitState}. post_handoff(Stream, _PostData, State) -> diff --git a/test/prop_quicer_nif.erl b/test/prop_quicer_nif.erl index 3d37b21b..94fbe883 100644 --- a/test/prop_quicer_nif.erl +++ b/test/prop_quicer_nif.erl @@ -115,7 +115,7 @@ prop_listen_robust() -> %% precondition: with valid listener handle prop_start_listener_with_valid_handle() -> ?FORALL( - {#prop_handle{type = listener, handle = Handle, destructor = Destroy} = H, On, Opts}, + {#prop_handle{type = listener, handle = Handle, destructor = Destroy}, On, Opts}, {valid_listen_handle(), listen_on(), quicer_listen_opts()}, begin case quicer_nif:start_listener(Handle, On, maps:from_list(Opts)) of @@ -373,7 +373,7 @@ prop_csend_with_valid_opts() -> begin SOpts = maps:from_list(Opts), case quicer_nif:csend(ConnHandle, Data, SOpts, Flags) of - {ok, StreamHandle} -> + {ok, _StreamHandle} -> Destroy(), collect(ok, true); {error, closed} -> diff --git a/test/prop_stateful_conn.erl b/test/prop_stateful_conn.erl index 5d4f113f..981f2c07 100644 --- a/test/prop_stateful_conn.erl +++ b/test/prop_stateful_conn.erl @@ -209,7 +209,7 @@ next_state(#{state := connected} = State, _Res, {call, quicer, close_connection, next_state(#{state := connected} = State, _Res, {call, quicer, shutdown_connection, _Args}) -> State#{state := closed}; next_state( - #{state := connected, handle := H} = State, ok, {call, quicer, controlling_process, [_, Owner]} + #{state := connected} = State, ok, {call, quicer, controlling_process, [_, Owner]} ) -> State#{owner := Owner}; next_state(State, _Res, {call, _Mod, _Fun, _Args}) -> diff --git a/test/quicer_echo_server_stream_callback.erl b/test/quicer_echo_server_stream_callback.erl index f3eb597e..f8d5d613 100644 --- a/test/quicer_echo_server_stream_callback.erl +++ b/test/quicer_echo_server_stream_callback.erl @@ -36,7 +36,7 @@ -export([handle_stream_data/4]). %% @doc handle handoff from other stream owner. -init_handoff(Stream, StreamOpts, Conn, #{is_orphan := true, flags := Flags}) -> +init_handoff(Stream, _StreamOpts, Conn, #{is_orphan := true, flags := Flags}) -> InitState = #{ stream => Stream, conn => Conn, diff --git a/test/quicer_listener_SUITE.erl b/test/quicer_listener_SUITE.erl index 38eee317..de7bcc81 100644 --- a/test/quicer_listener_SUITE.erl +++ b/test/quicer_listener_SUITE.erl @@ -100,7 +100,10 @@ end_per_group(_GroupName, _Config) -> %% @end %%-------------------------------------------------------------------- init_per_testcase(tc_listener_conf_reload_listen_on_neg, Config) -> - {skip, "MacOs is able to listen on port 1"}; + case os:type() of + {unix, darwin} -> {skip, "Not runnable on MacOS"}; + _ -> Config + end; init_per_testcase(_TestCase, Config) -> application:ensure_all_started(quicer), quicer_test_lib:cleanup_msquic(), @@ -542,11 +545,12 @@ tc_listener_conf_reload(Config) -> ), {ok, _} = quicer:send(Stream2, <<"ping_from_conn_2">>), - receive - {quic, new_stream, Stream2Remote, #{is_orphan := true}} -> - quicer:setopt(Stream2Remote, active, true), - ok - end, + Stream2Remote = + receive + {quic, new_stream, Stream2R, #{is_orphan := true}} -> + quicer:setopt(Stream2R, active, true), + Stream2R + end, receive {quic, <<"ping_from_conn_2">>, Stream2Remote, _} -> ok @@ -623,12 +627,12 @@ tc_listener_conf_reload_listen_on(Config) -> ), {ok, _} = quicer:send(Stream2, <<"ping_from_conn_2">>), - receive - {quic, new_stream, Stream2Remote, #{is_orphan := true}} -> - quicer:setopt(Stream2Remote, active, true), - ok - end, - + Stream2Remote = + receive + {quic, new_stream, Stream2R, #{is_orphan := true}} -> + quicer:setopt(Stream2R, active, true), + Stream2R + end, receive {quic, <<"ping_from_conn_2">>, Stream2Remote, _} -> ok after 2000 -> @@ -662,7 +666,7 @@ tc_listener_conf_reload_listen_on_neg(Config) -> Options = {ListenerOpts, ConnectionOpts, StreamOpts}, %% Given a QUIC connection between example client and example server - {ok, QuicApp} = quicer:spawn_listener(sample, Port, Options), + {ok, QuicApp} = quicer:spawn_listener(?FUNCTION_NAME, Port, Options), ClientConnOpts = default_conn_opts_verify(Config, ca), {ok, ClientConnPid} = example_client_connection:start_link( "localhost", @@ -705,11 +709,12 @@ tc_listener_conf_reload_listen_on_neg(Config) -> ), {ok, _} = quicer:send(Stream2, <<"ping_from_conn_2">>), - receive - {quic, new_stream, Stream2Remote, #{is_orphan := true}} -> - quicer:setopt(Stream2Remote, active, true), - ok - end, + Stream2Remote = + receive + {quic, new_stream, Stream2R, #{is_orphan := true}} -> + quicer:setopt(Stream2R, active, true), + Stream2R + end, receive {quic, <<"ping_from_conn_2">>, Stream2Remote, _} -> ok diff --git a/test/quicer_prop_gen.erl b/test/quicer_prop_gen.erl index 75661aa3..c7e47930 100644 --- a/test/quicer_prop_gen.erl +++ b/test/quicer_prop_gen.erl @@ -34,7 +34,8 @@ valid_csend_stream_opts/0, pid/0, data/0, - quicer_send_flags/0 + quicer_send_flags/0, + latin1_string/0 ]). -include_lib("proper/include/proper.hrl").