Browse Source

test(dssubs): adapt `t_lease_reconnect` testcase

Andrew Mayorov 1 year ago
parent
commit
8d116be1bd

+ 2 - 4
apps/emqx_ds_shared_sub/src/emqx_ds_shared_sub_registry.erl

@@ -4,8 +4,6 @@
 
 
 -module(emqx_ds_shared_sub_registry).
 -module(emqx_ds_shared_sub_registry).
 
 
--behaviour(supervisor).
-
 %% API
 %% API
 -export([
 -export([
     start_link/0,
     start_link/0,
@@ -17,7 +15,7 @@
     start_elector/2
     start_elector/2
 ]).
 ]).
 
 
-%% supervisor behaviour callbacks
+-behaviour(supervisor).
 -export([init/1]).
 -export([init/1]).
 
 
 %%------------------------------------------------------------------------------
 %%------------------------------------------------------------------------------
@@ -76,7 +74,7 @@ init([]) ->
     SupFlags = #{
     SupFlags = #{
         strategy => one_for_one,
         strategy => one_for_one,
         intensity => 10,
         intensity => 10,
-        period => 10
+        period => 1
     },
     },
     ChildSpecs = [],
     ChildSpecs = [],
     {ok, {SupFlags, ChildSpecs}}.
     {ok, {SupFlags, ChildSpecs}}.

+ 4 - 4
apps/emqx_ds_shared_sub/test/emqx_ds_shared_sub_SUITE.erl

@@ -417,8 +417,8 @@ t_lease_reconnect(_Config) ->
 
 
     ConnShared = emqtt_connect_sub(<<"client_shared">>),
     ConnShared = emqtt_connect_sub(<<"client_shared">>),
 
 
-    %% Stop registry to simulate unability to find leader.
-    ok = supervisor:terminate_child(emqx_ds_shared_sub_sup, emqx_ds_shared_sub_registry),
+    %% Simulate unability to find leader.
+    ok = emqx_ds_shared_sub_leader_store:close(),
 
 
     ?assertWaitEvent(
     ?assertWaitEvent(
         {ok, _, _} = emqtt:subscribe(ConnShared, <<"$share/gr2/topic2/#">>, 1),
         {ok, _, _} = emqtt:subscribe(ConnShared, <<"$share/gr2/topic2/#">>, 1),
@@ -426,9 +426,9 @@ t_lease_reconnect(_Config) ->
         5_000
         5_000
     ),
     ),
 
 
-    %% Start registry, agent should retry after some time and find the leader.
+    %% Agent should retry after some time and find the leader.
     ?assertWaitEvent(
     ?assertWaitEvent(
-        {ok, _} = supervisor:restart_child(emqx_ds_shared_sub_sup, emqx_ds_shared_sub_registry),
+        ok = emqx_ds_shared_sub_leader_store:open(),
         #{?snk_kind := leader_lease_streams},
         #{?snk_kind := leader_lease_streams},
         5_000
         5_000
     ),
     ),