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

test(authz): make sure `emqx_resource` and `emqx_connector` stoped

apps/emqx_authz/test/emqx_authz_api_sources_SUITE.erl

@@ -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).

apps/emqx_authz/test/emqx_authz_http_SUITE.erl

@@ -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

apps/emqx_authz/test/emqx_authz_mongodb_SUITE.erl

@@ -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(

apps/emqx_authz/test/emqx_authz_mysql_SUITE.erl

@@ -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(

apps/emqx_authz/test/emqx_authz_postgresql_SUITE.erl

@@ -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(

apps/emqx_authz/test/emqx_authz_redis_SUITE.erl

@@ -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(