fix: make prop tests stable

emqx · Oct 21, 2024 · c0815e2 · c0815e2
1 parent fdc2350
commit c0815e2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/test/example_client_connection.erl b/test/example_client_connection.erl
@@ -106,7 +106,7 @@ new_stream(
     } = CBState
 ) ->
     %% Spawn new stream
-    case quicer_remote_stream:start_link(example_server_stream, Stream, Conn, SOpts, Flags) of
+    case quicer_remote_stream:start_link(example_client_stream, Stream, Conn, SOpts, Flags) of
         {ok, StreamOwner} ->
             case quicer:handoff_stream(Stream, StreamOwner) of
                 ok ->
@@ -116,7 +116,8 @@ new_stream(
                     {ok, CBState#{streams := [{E, Stream} | Streams]}}
             end;
         Other ->
-            Other
+            ct:pal("Start accepting remote stream error ~p", [Other]),
+            {ok, CBState#{streams := [{start_error, Stream} | Streams]}}
     end.
 
 dgram_state_changed(_Conn, _Flags, S) ->
@@ -152,17 +153,19 @@ peer_needs_streams(C, bidi_streams, S) ->
 handle_info({'EXIT', _Pid, _Reason}, State) ->
     {ok, State};
 handle_info({quic, Sig, Stream, _} = Msg, #{streams := Streams} = S) when
-    %% @FIXME, not desired behavior.
-    %% Casued by inflight quic Msg during stream handoff
     Sig == peer_send_shutdown orelse Sig == stream_closed
 ->
-    {OwnerPid, Stream} = lists:keyfind(Stream, 2, Streams),
-    NewS =
-        case OwnerPid == owner_down orelse OwnerPid == closed of
-            true ->
-                quicer:async_shutdown_stream(Stream),
-                S#{streams := lists:keydelete(Stream, 2, Streams)};
-            false ->
-                error(fixme)
-        end,
-    {ok, NewS}.
+    case lists:keyfind(Stream, 2, Streams) of
+        {Reason, Stream} when
+            Reason =:= owner_down orelse
+                Reason =:= closed orelse
+                Reason =:= start_error
+        ->
+            _ = quicer:async_shutdown_stream(Stream),
+            {ok, S#{streams := lists:keydelete(Stream, 2, Streams)}};
+        {OwnerPid, Stream} when is_pid(OwnerPid) ->
+            {error, {fixme, bug_handoff_fail}};
+        false ->
+            %% garbage signals from already dead stream (such like crashed owner)
+            {ok, S}
+    end.
diff --git a/test/example_client_stream.erl b/test/example_client_stream.erl
@@ -39,9 +39,16 @@
 -include("quicer.hrl").
 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
 
-init_handoff(_Stream, _StreamOpts, _Conn, _Flags) ->
-    %% stream owner already set while starts.
-    {stop, not_impl, #{}}.
+init_handoff(Stream, _StreamOpts, Conn, #{flags := Flags}) ->
+    InitState = #{
+        stream => Stream,
+        conn => Conn,
+        peer_stream => undefined,
+        is_local => false,
+        is_unidir => quicer:is_unidirectional(Flags)
+    },
+    ct:pal("init_handoff ~p", [{InitState, _StreamOpts}]),
+    {ok, InitState}.
 
 post_handoff(Stream, _PostData, State) ->
     ok = quicer:setopt(Stream, active, true),

diff --git a/test/example_server_stream.erl b/test/example_server_stream.erl
@@ -48,7 +48,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_stateful_server_conn.erl b/test/prop_stateful_server_conn.erl
@@ -288,6 +288,8 @@ next_state(State, Res, Call) ->
 
 do_next_state(#{state := accepted} = State, {error, _}, {call, quicer, handshake, _Args}) ->
     State;
+do_next_state(#{state := _} = State, {error, closed}, {call, quicer, _, _Args}) ->
+    State#{state := closed};
 do_next_state(#{state := accepted} = State, _Res, {call, quicer, handshake, _Args}) ->
     State#{state := connected};
 do_next_state(#{state := accepted} = State, _Res, {call, quicer, close_connection, _Args}) ->