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

fix(test): test case failed by unload

This commit is contained in:
zhongwencool 2022-01-19 19:10:23 +08:00
parent 6378cd1f9a
commit 4317845482
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib-ce/emqx_modules/src/emqx_modules.appup.src
View File

@ -2,21 +2,25 @@
{VSN, {VSN,
[ [
{"4.3.3", [ {"4.3.3", [
{apply, {emqx_metrics, ensure, [['client.acl.allow', 'client.acl.ignore', 'client.acl.deny']]}},
{load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []} {load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.2", [ {"4.3.2", [
{load_module, emqx_mod_presence, brutal_purge, soft_purge, []}, {load_module, emqx_mod_presence, brutal_purge, soft_purge, []},
{apply, {emqx_metrics, ensure, [['client.acl.allow', 'client.acl.ignore', 'client.acl.deny']]}},
{load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []} {load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.1", [ {"4.3.1", [
{load_module, emqx_mod_presence, brutal_purge, soft_purge, []}, {load_module, emqx_mod_presence, brutal_purge, soft_purge, []},
{load_module, emqx_mod_api_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_mod_api_topic_metrics, brutal_purge, soft_purge, []},
{apply, {emqx_metrics, ensure, [['client.acl.allow', 'client.acl.ignore', 'client.acl.deny']]}},
{load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []} {load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []}
]}, ]},
{"4.3.0", [ {"4.3.0", [
{update, emqx_mod_delayed, {advanced, []}}, {update, emqx_mod_delayed, {advanced, []}},
{load_module, emqx_mod_presence, brutal_purge, soft_purge, []}, {load_module, emqx_mod_presence, brutal_purge, soft_purge, []},
{load_module, emqx_mod_api_topic_metrics, brutal_purge, soft_purge, []}, {load_module, emqx_mod_api_topic_metrics, brutal_purge, soft_purge, []},
{apply, {emqx_metrics, ensure, [['client.acl.allow', 'client.acl.ignore', 'client.acl.deny']]}},
{load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []} {load_module, emqx_mod_acl_internal, brutal_purge, soft_purge, []}
]}, ]},
{<<".*">>, []} {<<".*">>, []}

4
lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl
View File

@ -38,10 +38,12 @@ t_load_unload(_) ->
?assertEqual({error,already_exists}, emqx_mod_acl_internal:load([])). ?assertEqual({error,already_exists}, emqx_mod_acl_internal:load([])).
t_check_acl(_) -> t_check_acl(_) ->
emqx_mod_acl_internal:load([]),
Rules=#{publish => [{allow,all}], subscribe => [{deny, all}]}, Rules=#{publish => [{allow,all}], subscribe => [{deny, all}]},
?assertEqual({ok, allow}, emqx_mod_acl_internal:check_acl(clientinfo(), publish, <<"t">>, [], Rules)), ?assertEqual({ok, allow}, emqx_mod_acl_internal:check_acl(clientinfo(), publish, <<"t">>, [], Rules)),
?assertEqual({ok, deny}, emqx_mod_acl_internal:check_acl(clientinfo(), subscribe, <<"t">>, [], Rules)), ?assertEqual({ok, deny}, emqx_mod_acl_internal:check_acl(clientinfo(), subscribe, <<"t">>, [], Rules)),
?assertEqual(ok, emqx_mod_acl_internal:check_acl(clientinfo(), connect, <<"t">>, [], Rules)). ?assertEqual(ok, emqx_mod_acl_internal:check_acl(clientinfo(), connect, <<"t">>, [], Rules)),
emqx_mod_acl_internal:unload([]).
t_reload_acl(_) -> t_reload_acl(_) ->
?assertEqual(ok, emqx_mod_acl_internal:reload([])). ?assertEqual(ok, emqx_mod_acl_internal:reload([])).