yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: fix test case flakyness

This commit is contained in:
zmstone 2024-04-18 09:32:05 +02:00
parent 55941000c0
commit ab763fe665
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/emqx_auth/src/emqx_authn/emqx_authn_chains.erl
View File

@ -353,13 +353,13 @@ init(_Opts) ->
ok = emqx_config_handler:add_handler([listeners, '?', '?', ?CONF_ROOT], Module), ok = emqx_config_handler:add_handler([listeners, '?', '?', ?CONF_ROOT], Module),
ok = hook_deny(), ok = hook_deny(),
{ok, #{hooked => false, providers => #{}, init_done => false}, {ok, #{hooked => false, providers => #{}, init_done => false},
{continue, initialize_authentication}}. {continue, {initialize_authentication, init}}}.
handle_call(get_providers, _From, #{providers := Providers} = State) -> handle_call(get_providers, _From, #{providers := Providers} = State) ->
reply(Providers, State); reply(Providers, State);
handle_call( handle_call(
{register_providers, Providers}, {register_providers, Providers},
_From, From,
#{providers := Reg0} = State #{providers := Reg0} = State
) -> ) ->
case lists:filter(fun({T, _}) -> maps:is_key(T, Reg0) end, Providers) of case lists:filter(fun({T, _}) -> maps:is_key(T, Reg0) end, Providers) of
@ -371,7 +371,7 @@ handle_call(
Reg0, Reg0,
Providers Providers
), ),
reply(ok, State#{providers := Reg}, initialize_authentication); reply(ok, State#{providers := Reg}, {initialize_authentication, From});
Clashes -> Clashes ->
reply({error, {authentication_type_clash, Clashes}}, State) reply({error, {authentication_type_clash, Clashes}}, State)
end; end;
@ -447,10 +447,10 @@ handle_call(Req, _From, State) ->
?SLOG(error, #{msg => "unexpected_call", call => Req}), ?SLOG(error, #{msg => "unexpected_call", call => Req}),
{reply, ignored, State}. {reply, ignored, State}.
handle_continue(initialize_authentication, #{init_done := true} = State) -> handle_continue({initialize_authentication, _From}, #{init_done := true} = State) ->
{noreply, State}; {noreply, State};
handle_continue(initialize_authentication, #{providers := Providers} = State) -> handle_continue({initialize_authentication, From}, #{providers := Providers} = State) ->
InitDone = initialize_authentication(Providers), InitDone = initialize_authentication(Providers, From),
{noreply, maybe_hook(State#{init_done := InitDone})}. {noreply, maybe_hook(State#{init_done := InitDone})}.
handle_cast(Req, State) -> handle_cast(Req, State) ->
@ -484,11 +484,13 @@ code_change(_OldVsn, State, _Extra) ->
%% Private functions %% Private functions
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
initialize_authentication(Providers) -> initialize_authentication(Providers, From) ->
ProviderTypes = maps:keys(Providers), ProviderTypes = maps:keys(Providers),
Chains = chain_configs(), Chains = chain_configs(),
HasProviders = has_providers_for_configs(Chains, ProviderTypes), HasProviders = has_providers_for_configs(Chains, ProviderTypes),
do_initialize_authentication(Providers, Chains, HasProviders). Result = do_initialize_authentication(Providers, Chains, HasProviders),
?tp(info, authn_chains_initialization_done, #{from => From, result => Result}),
Result.
do_initialize_authentication(_Providers, _Chains, _HasProviders = false) -> do_initialize_authentication(_Providers, _Chains, _HasProviders = false) ->
false; false;
@ -500,7 +502,6 @@ do_initialize_authentication(Providers, Chains, _HasProviders = true) ->
Chains Chains
), ),
ok = unhook_deny(), ok = unhook_deny(),
?tp(info, authn_chains_initialization_done, #{}),
true. true.
initialize_chain_authentication(_Providers, _ChainName, []) -> initialize_chain_authentication(_Providers, _ChainName, []) ->

3
apps/emqx_auth/test/emqx_authn/emqx_authn_init_SUITE.erl
View File

@ -69,9 +69,10 @@ t_initialize(_Config) ->
emqx_access_control:authenticate(?CLIENTINFO) emqx_access_control:authenticate(?CLIENTINFO)
), ),
Self = self(),
?assertWaitEvent( ?assertWaitEvent(
ok = emqx_authn_test_lib:register_fake_providers([{password_based, built_in_database}]), ok = emqx_authn_test_lib:register_fake_providers([{password_based, built_in_database}]),
#{?snk_kind := authn_chains_initialization_done}, #{?snk_kind := authn_chains_initialization_done, from := {Self, _}},
100 100
), ),