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

Merge pull request #7285 from JimMoen/fix-authz-test 

test(authz): make sure `emqx_resource` and `emqx_connector` stoped
This commit is contained in:
Xinyu Liu 2022-03-12 00:37:26 +08:00 committed by GitHub
parent acd9aaff4d b41e396ed2
commit 24251aea5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl
View File

@ -119,6 +119,9 @@ end_per_suite(_Config) ->
#{<<"no_match">> => <<"allow">>,
<<"cache">> => #{<<"enable">> => <<"true">>},
<<"sources">> => []}),
%% resource and connector should be stop first,
%% or authz_[mysql|pgsql|redis..]_SUITE would be failed
ok = stop_apps([emqx_resource, emqx_connector]),
emqx_common_test_helpers:stop_apps([emqx_dashboard, emqx_authz, emqx_conf]),
meck:unload(emqx_resource),
ok.
@ -357,3 +360,6 @@ auth_header_() ->
{"Authorization", "Bearer " ++ binary_to_list(Token)}.
data_dir() -> emqx:data_dir().
stop_apps(Apps) ->
lists:foreach(fun application:stop/1, Apps).

1
apps/emqx_authz/test/emqx_authz_http_SUITE.erl
View File

@ -30,6 +30,7 @@ all() ->
emqx_common_test_helpers:all(?MODULE).
init_per_suite(Config) ->
ok = stop_apps([emqx_resource, emqx_connector, cowboy]),
ok = emqx_common_test_helpers:start_apps(
[emqx_conf, emqx_authz],
fun set_special_configs/1

1
apps/emqx_authz/test/emqx_authz_mongodb_SUITE.erl
View File

@ -34,6 +34,7 @@ groups() ->
[].
init_per_suite(Config) ->
ok = stop_apps([emqx_resource, emqx_connector]),
case emqx_common_test_helpers:is_tcp_server_available(?MONGO_HOST, ?MONGO_DEFAULT_PORT) of
true ->
ok = emqx_common_test_helpers:start_apps(

1
apps/emqx_authz/test/emqx_authz_mysql_SUITE.erl
View File

@ -33,6 +33,7 @@ groups() ->
[].
init_per_suite(Config) ->
ok = stop_apps([emqx_resource, emqx_connector]),
case emqx_common_test_helpers:is_tcp_server_available(?MYSQL_HOST, ?MYSQL_DEFAULT_PORT) of
true ->
ok = emqx_common_test_helpers:start_apps(

1
apps/emqx_authz/test/emqx_authz_postgresql_SUITE.erl
View File

@ -33,6 +33,7 @@ groups() ->
[].
init_per_suite(Config) ->
ok = stop_apps([emqx_resource, emqx_connector]),
case emqx_common_test_helpers:is_tcp_server_available(?PGSQL_HOST, ?PGSQL_DEFAULT_PORT) of
true ->
ok = emqx_common_test_helpers:start_apps(

1
apps/emqx_authz/test/emqx_authz_redis_SUITE.erl
View File

@ -34,6 +34,7 @@ groups() ->
[].
init_per_suite(Config) ->
ok = stop_apps([emqx_resource, emqx_connector]),
case emqx_common_test_helpers:is_tcp_server_available(?REDIS_HOST, ?REDIS_DEFAULT_PORT) of
true ->
ok = emqx_common_test_helpers:start_apps(