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

test(router): avoid testsuite collisions

This commit is contained in:
Andrew Mayorov 2023-08-30 20:11:43 +04:00
parent b1defa29d7
commit fb094e1d47
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/test/emqx_router_SUITE.erl
View File

@ -40,7 +40,7 @@ groups() ->
]. ].
init_per_group(GroupName, Config) -> init_per_group(GroupName, Config) ->
WorkDir = filename:join([?config(priv_dir, Config), GroupName]), WorkDir = filename:join([?config(priv_dir, Config), ?MODULE, GroupName]),
AppSpecs = [ AppSpecs = [
{emqx, #{ {emqx, #{
config => mk_config(GroupName), config => mk_config(GroupName),

13
apps/emqx/test/emqx_router_helper_SUITE.erl
View File

@ -40,7 +40,7 @@ groups() ->
]. ].
init_per_group(GroupName, Config) -> init_per_group(GroupName, Config) ->
WorkDir = filename:join([?config(priv_dir, Config), GroupName]), WorkDir = filename:join([?config(priv_dir, Config), ?MODULE, GroupName]),
AppSpecs = [{emqx, mk_config(GroupName)}], AppSpecs = [{emqx, mk_config(GroupName)}],
Apps = emqx_cth_suite:start(AppSpecs, #{work_dir => WorkDir}), Apps = emqx_cth_suite:start(AppSpecs, #{work_dir => WorkDir}),
[{group_name, GroupName}, {group_apps, Apps} | Config]. [{group_name, GroupName}, {group_apps, Apps} | Config].
@ -60,16 +60,15 @@ mk_config(routing_schema_v2) ->
}. }.
init_per_testcase(TestCase, Config) when init_per_testcase(TestCase, Config) when
TestCase =:= t_cleanup_membership_mnesia_down;
TestCase =:= t_cleanup_membership_node_down;
TestCase =:= t_cleanup_monitor_node_down TestCase =:= t_cleanup_monitor_node_down
-> ->
ok = snabbkaffe:start_trace(), ok = snabbkaffe:start_trace(),
WorkDir = filename:join([?config(priv_dir, Config), ?config(group_name, Config), TestCase]), GroupName = ?config(group_name, Config),
WorkDir = filename:join([?config(priv_dir, Config), ?MODULE, GroupName, TestCase]),
[Slave] = emqx_cth_cluster:start( [Slave] = emqx_cth_cluster:start(
[ [
{?MODULE, #{ {?MODULE, #{
apps => [{emqx, mk_config(?config(group_name, Config))}], apps => [{emqx, mk_config(GroupName)}],
join_to => node() join_to => node()
}} }}
], ],
@ -77,11 +76,10 @@ init_per_testcase(TestCase, Config) when
), ),
[{slave, Slave} | Config]; [{slave, Slave} | Config];
init_per_testcase(_TestCase, Config) -> init_per_testcase(_TestCase, Config) ->
ok = snabbkaffe:start_trace(),
Config. Config.
end_per_testcase(TestCase, Config) when end_per_testcase(TestCase, Config) when
TestCase =:= t_cleanup_membership_mnesia_down;
TestCase =:= t_cleanup_membership_node_down;
TestCase =:= t_cleanup_monitor_node_down TestCase =:= t_cleanup_monitor_node_down
-> ->
Slave = ?config(slave, Config), Slave = ?config(slave, Config),
@ -89,6 +87,7 @@ end_per_testcase(TestCase, Config) when
ok = snabbkaffe:stop(), ok = snabbkaffe:stop(),
ok; ok;
end_per_testcase(_TestCase, _Config) -> end_per_testcase(_TestCase, _Config) ->
ok = snabbkaffe:stop(),
ok. ok.
t_monitor(_) -> t_monitor(_) ->