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

test(ds): simplify cluster test setups

This commit is contained in:
Andrew Mayorov 2023-09-17 17:13:26 +04:00
parent 7c4f68dd3d
commit 8af107e28d
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/emqx/integration_test/emqx_ds_SUITE.erl
View File

@ -72,30 +72,19 @@ end_per_testcase(_TestCase, _Config) ->
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
cluster(#{n := N}) -> cluster(#{n := N}) ->
Node1 = ds_SUITE1, Spec = #{role => core, apps => app_specs()},
Spec = #{ lists:map(
role => core, fun(M) ->
join_to => emqx_cth_cluster:node_name(Node1), Name = list_to_atom("ds_SUITE" ++ integer_to_list(M)),
apps => app_specs() {Name, Spec}
}, end,
[ lists:seq(1, N)
{Node1, Spec} ).
| lists:map(
fun(M) ->
Name = binary_to_atom(<<"ds_SUITE", (integer_to_binary(M))/binary>>),
{Name, Spec}
end,
lists:seq(2, N)
)
].
app_specs() -> app_specs() ->
[ [
emqx_durable_storage, emqx_durable_storage,
{emqx, #{ {emqx, "persistent_session_store = {ds = true}"}
config => #{persistent_session_store => #{ds => true}},
override_env => [{boot_modules, [broker, listeners]}]
}}
]. ].
get_mqtt_port(Node, Type) -> get_mqtt_port(Node, Type) ->

14
apps/emqx/test/emqx_persistent_messages_SUITE.erl
View File

@ -315,21 +315,13 @@ get_iterator_ids(Node, ClientId) ->
app_specs() -> app_specs() ->
[ [
emqx_durable_storage, emqx_durable_storage,
{emqx, #{ {emqx, "persistent_session_store {ds = true}"}
config => #{persistent_session_store => #{ds => true}},
override_env => [{boot_modules, [broker, listeners]}]
}}
]. ].
cluster() -> cluster() ->
Node1 = persistent_messages_SUITE1, Spec = #{role => core, apps => app_specs()},
Spec = #{
role => core,
join_to => emqx_cth_cluster:node_name(Node1),
apps => app_specs()
},
[ [
{Node1, Spec}, {persistent_messages_SUITE1, Spec},
{persistent_messages_SUITE2, Spec} {persistent_messages_SUITE2, Spec}
]. ].