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

Merge pull request #13426 from thalesmg/20240705-r57-test-flaky-plugin-start-enabled 

test(plugins): fix flaky test
This commit is contained in:
Thales Macedo Garitezi 2024-07-08 09:19:53 -03:00 committed by GitHub
parent 29d7a511f1 f1b4467fe1
commit 166f5e5f12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/emqx_plugins/test/emqx_plugins_SUITE.erl
View File

@ -906,7 +906,8 @@ group_t_cluster_leave(Config) ->
%% hooks added by the plugin's `application:start/2' callback are indeed in place. %% hooks added by the plugin's `application:start/2' callback are indeed in place.
%% See also: https://github.com/emqx/emqx/issues/13378 %% See also: https://github.com/emqx/emqx/issues/13378
t_start_node_with_plugin_enabled({init, Config}) -> t_start_node_with_plugin_enabled({init, Config}) ->
#{package := Package, shdir := InstallDir} = get_demo_plugin_package(), #{package := Package} = get_demo_plugin_package(),
Basename = filename:basename(Package),
NameVsn = filename:basename(Package, ?PACKAGE_SUFFIX), NameVsn = filename:basename(Package, ?PACKAGE_SUFFIX),
AppSpecs = [ AppSpecs = [
emqx, emqx,
@ -917,7 +918,7 @@ t_start_node_with_plugin_enabled({init, Config}) ->
#{ #{
plugins => plugins =>
#{ #{
install_dir => InstallDir, install_dir => <<"plugins">>,
states => states =>
[ [
#{ #{
@ -938,6 +939,14 @@ t_start_node_with_plugin_enabled({init, Config}) ->
], ],
#{work_dir => emqx_cth_suite:work_dir(?FUNCTION_NAME, Config)} #{work_dir => emqx_cth_suite:work_dir(?FUNCTION_NAME, Config)}
), ),
lists:foreach(
fun(#{work_dir := WorkDir}) ->
Destination = filename:join([WorkDir, "plugins", Basename]),
ok = filelib:ensure_dir(Destination),
{ok, _} = file:copy(Package, Destination)
end,
Specs
),
Names = [Name1, Name2], Names = [Name1, Name2],
Nodes = [emqx_cth_cluster:node_name(N) || N <- Names], Nodes = [emqx_cth_cluster:node_name(N) || N <- Names],
[ [
@ -955,7 +964,9 @@ t_start_node_with_plugin_enabled(Config) when is_list(Config) ->
?check_trace( ?check_trace(
#{timetrap => 10_000}, #{timetrap => 10_000},
begin begin
[N1, N2 | _] = emqx_cth_cluster:start(NodeSpecs), %% Hack: we use `restart' here to disable the clean slate verification, as we
%% just created and populated the `plugins' directory...
[N1, N2 | _] = lists:flatmap(fun emqx_cth_cluster:restart/1, NodeSpecs),
?ON(N1, assert_started_and_hooks_loaded()), ?ON(N1, assert_started_and_hooks_loaded()),
?ON(N2, assert_started_and_hooks_loaded()), ?ON(N2, assert_started_and_hooks_loaded()),
%% Now make them join. %% Now make them join.