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

test(plugins): avoid using same workdir for different nodes

This commit is contained in:
Andrew Mayorov 2024-02-16 13:32:58 +01:00
parent 3a008c8b4c
commit d60ff1e616
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,12 +604,9 @@ t_load_config_from_cli(Config) when is_list(Config) ->
ok. ok.
group_t_copy_plugin_to_a_new_node({init, Config}) -> group_t_copy_plugin_to_a_new_node({init, Config}) ->
WorkDir = proplists:get_value(install_dir, Config), FromInstallDir = filename:join(emqx_cth_suite:work_dir(?FUNCTION_NAME, Config), from),
FromInstallDir = filename:join(WorkDir, atom_to_list(plugins_copy_from)),
file:del_dir_r(FromInstallDir),
ok = filelib:ensure_path(FromInstallDir), ok = filelib:ensure_path(FromInstallDir),
ToInstallDir = filename:join(WorkDir, atom_to_list(plugins_copy_to)), ToInstallDir = filename:join(emqx_cth_suite:work_dir(?FUNCTION_NAME, Config), to),
file:del_dir_r(ToInstallDir),
ok = filelib:ensure_path(ToInstallDir), ok = filelib:ensure_path(ToInstallDir),
#{package := Package, release_name := PluginName} = get_demo_plugin_package(FromInstallDir), #{package := Package, release_name := PluginName} = get_demo_plugin_package(FromInstallDir),
Apps = [ Apps = [
@ -697,8 +694,7 @@ group_t_copy_plugin_to_a_new_node(Config) ->
%% checks that we can start a cluster with a lone node. %% checks that we can start a cluster with a lone node.
group_t_copy_plugin_to_a_new_node_single_node({init, Config}) -> group_t_copy_plugin_to_a_new_node_single_node({init, Config}) ->
WorkDir = ?config(install_dir, Config), ToInstallDir = emqx_cth_suite:work_dir(?FUNCTION_NAME, Config),
ToInstallDir = filename:join(WorkDir, "plugins_copy_to"),
file:del_dir_r(ToInstallDir), file:del_dir_r(ToInstallDir),
ok = filelib:ensure_path(ToInstallDir), ok = filelib:ensure_path(ToInstallDir),
#{package := Package, release_name := PluginName} = get_demo_plugin_package(ToInstallDir), #{package := Package, release_name := PluginName} = get_demo_plugin_package(ToInstallDir),
@ -718,9 +714,7 @@ group_t_copy_plugin_to_a_new_node_single_node({init, Config}) ->
], ],
[CopyToNode] = emqx_cth_cluster:start( [CopyToNode] = emqx_cth_cluster:start(
[{plugins_copy_to, #{role => core, apps => Apps}}], [{plugins_copy_to, #{role => core, apps => Apps}}],
#{ #{work_dir => emqx_cth_suite:work_dir(?FUNCTION_NAME, Config)}
work_dir => emqx_cth_suite:work_dir(?FUNCTION_NAME, Config)
}
), ),
[ [
{to_install_dir, ToInstallDir}, {to_install_dir, ToInstallDir},
@ -752,36 +746,31 @@ group_t_copy_plugin_to_a_new_node_single_node(Config) ->
ok. ok.
group_t_cluster_leave({init, Config}) -> group_t_cluster_leave({init, Config}) ->
WorkDir = ?config(install_dir, Config), Specs = emqx_cth_cluster:mk_nodespecs(
ToInstallDir = filename:join(WorkDir, "plugins_copy_to"), [
file:del_dir_r(ToInstallDir), {group_t_cluster_leave1, #{role => core, apps => [emqx, emqx_conf, emqx_ctl]}},
ok = filelib:ensure_path(ToInstallDir), {group_t_cluster_leave2, #{role => core, apps => [emqx, emqx_conf, emqx_ctl]}}
#{package := Package, release_name := PluginName} = get_demo_plugin_package(ToInstallDir), ],
#{work_dir => emqx_cth_suite:work_dir(?FUNCTION_NAME, Config)}
),
Nodes = emqx_cth_cluster:start(Specs),
InstallRelDir = "plugins_copy_to",
InstallDirs = [filename:join(WD, InstallRelDir) || #{work_dir := WD} <- Specs],
ok = lists:foreach(fun filelib:ensure_path/1, InstallDirs),
#{package := Package, release_name := PluginName} = get_demo_plugin_package(hd(InstallDirs)),
NameVsn = filename:basename(Package, ?PACKAGE_SUFFIX), NameVsn = filename:basename(Package, ?PACKAGE_SUFFIX),
Apps = [ [{ok, _}, {ok, _}] = erpc:multicall(Nodes, emqx_cth_suite, start_app, [
emqx, emqx_plugins,
emqx_conf, #{
emqx_ctl,
{emqx_plugins, #{
config => #{ config => #{
plugins => #{ plugins => #{
install_dir => ToInstallDir, install_dir => InstallRelDir,
states => [#{name_vsn => NameVsn, enable => true}] states => [#{name_vsn => NameVsn, enable => true}]
} }
} }
}}
],
Nodes = emqx_cth_cluster:start(
[
{group_t_cluster_leave1, #{role => core, apps => Apps}},
{group_t_cluster_leave2, #{role => core, apps => Apps}}
],
#{
work_dir => emqx_cth_suite:work_dir(?FUNCTION_NAME, Config)
} }
), ]),
[ [
{to_install_dir, ToInstallDir},
{nodes, Nodes}, {nodes, Nodes},
{name_vsn, NameVsn}, {name_vsn, NameVsn},
{plugin_name, PluginName} {plugin_name, PluginName}