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

Merge remote-tracking branch 'origin/release-v43' into main-v4.3

This commit is contained in:
Zaiming (Stone) Shi 2022-10-06 10:31:01 +02:00
parent eaeb26a1b4 f667c174a8
commit 10f1052be5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/emqx_node_helpers.erl
View File

@ -40,7 +40,9 @@ start_slave(Name, Opts) ->
{ok, _} -> {ok, _} ->
ok; ok;
{error, started_not_connected, _} -> {error, started_not_connected, _} ->
ok ok;
Other ->
throw(Other)
end, end,
pong = net_adm:ping(Node), pong = net_adm:ping(Node),
setup_node(Node, Opts), setup_node(Node, Opts),
@ -92,7 +94,11 @@ setup_node(Node, #{} = Opts) ->
end, end,
EnvHandler = maps:get(env_handler, Opts, DefaultEnvHandler), EnvHandler = maps:get(env_handler, Opts, DefaultEnvHandler),
[ok = rpc:call(Node, application, load, [App]) || App <- [gen_rpc, emqx]], %% apps need to be loaded before starting for ekka to find and create mnesia tables
LoadApps = lists:usort([gen_rcp, emqx] ++ ?SLAVE_START_APPS),
lists:foreach(fun(App) ->
rpc:call(Node, application, load, [App])
end, LoadApps),
ok = rpc:call(Node, emqx_ct_helpers, start_apps, [StartApps, EnvHandler]), ok = rpc:call(Node, emqx_ct_helpers, start_apps, [StartApps, EnvHandler]),
case maps:get(no_join, Opts, false) of case maps:get(no_join, Opts, false) of