From 85d568be602c94d6e99a00f63b9fc30c7429f4b5 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Wed, 12 Jan 2022 18:46:05 +0800 Subject: [PATCH] chore(test): clean up auth_mnesia_SUITE:t_boot config --- apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src | 10 +++++----- apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src index 2a6353760..95a0c1877 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.appup.src @@ -7,13 +7,13 @@ {update, emqx_auth_mnesia_sup, supervisor}, {apply, {emqx_acl_mnesia_migrator, start_supervised, []}}, {load_module,emqx_auth_mnesia_api, brutal_purge,soft_purge,[]}, - {load_module,emqx_acl_mnesia, brutal_purge, soft_purge,[]}, + {load_module,emqx_acl_mnesia, brutal_purge,soft_purge,[]}, {load_module,emqx_acl_mnesia_api, brutal_purge,soft_purge,[]}, {load_module,emqx_acl_mnesia_cli, brutal_purge,soft_purge,[]} ]}, {<<"4.3.4">>, [ - {load_module,emqx_auth_mnesia, brutal_purge, soft_purge,[]}, - {load_module,emqx_auth_mnesia_cli, brutal_purge,soft_purge,[]}, + {load_module,emqx_auth_mnesia, brutal_purge,soft_purge,[]}, + {load_module,emqx_auth_mnesia_cli, brutal_purge,soft_purge,[]} ]}, {<<".*">>, [ ]} @@ -30,8 +30,8 @@ {delete_module,emqx_acl_mnesia_db} ]}, {<<"4.3.4">>, [ - {load_module,emqx_auth_mnesia, brutal_purge, soft_purge,[]}, - {load_module,emqx_auth_mnesia_cli, brutal_purge,soft_purge,[]}, + {load_module,emqx_auth_mnesia, brutal_purge,soft_purge,[]}, + {load_module,emqx_auth_mnesia_cli, brutal_purge,soft_purge,[]} ]}, {<<".*">>, [ ]} diff --git a/apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl b/apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl index 01dff1488..4246965d9 100644 --- a/apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl +++ b/apps/emqx_auth_mnesia/test/emqx_auth_mnesia_SUITE.erl @@ -73,6 +73,7 @@ set_default(ClientId, UserName, Pwd, HashType) -> application:set_env(emqx_auth_mnesia, clientid_list, [{ClientId, Pwd}]), application:set_env(emqx_auth_mnesia, username_list, [{UserName, Pwd}]), application:set_env(emqx_auth_mnesia, password_hash, HashType), + application:set_env(emqx_auth_mnesia, password_hash, HashType), ok. %%------------------------------------------------------------------------------ %% Testcases @@ -123,6 +124,7 @@ t_boot(_Config) -> ?assertEqual(Ok, emqx_auth_mnesia:check(#{clientid => <<"NotExited">>, username => UserName, password => NewPwd2}, #{}, #{hash_type => plain})), + clean_all_users(), ok. t_management(_Config) ->