fix: bad list & bad SUITE

This commit is contained in:
DDDHuang 2022-03-15 21:57:51 +08:00
parent 02e7f3bfe0
commit 95cc5a19c8
5 changed files with 19 additions and 8 deletions

View File

@ -160,4 +160,4 @@ import_content(Content) ->
tmp_filename() -> tmp_filename() ->
Seconds = erlang:system_time(second), Seconds = erlang:system_time(second),
{{Y, M, D}, {H, MM, S}} = emqx_mgmt_util:datetime(Seconds), {{Y, M, D}, {H, MM, S}} = emqx_mgmt_util:datetime(Seconds),
io_lib:format("emqx-export-~p-~p-~p-~p-~p-~p.json", [Y, M, D, H, MM, S]). list_to_binary(io_lib:format("emqx-export-~p-~p-~p-~p-~p-~p.json", [Y, M, D, H, MM, S])).

View File

@ -183,7 +183,10 @@ do_import(File, Config, Overrides) ->
mnesia:clear_table(?ACL_TABLE2), mnesia:clear_table(?ACL_TABLE2),
mnesia:clear_table(emqx_user), mnesia:clear_table(emqx_user),
emqx_acl_mnesia_migrator:migrate_records(), emqx_acl_mnesia_migrator:migrate_records(),
Filename = filename:join(proplists:get_value(data_dir, Config), File), Filename = filename:basename(File),
FilePath = filename:join([proplists:get_value(data_dir, Config), File]),
{ok, Bin} = file:read_file(FilePath),
ok = emqx_mgmt_data_backup:upload_backup_file(Filename, Bin),
emqx_mgmt_data_backup:import(Filename, Overrides). emqx_mgmt_data_backup:import(Filename, Overrides).
test_import(username, {Username, Password}) -> test_import(username, {Username, Password}) ->

View File

@ -34,14 +34,18 @@ init_per_suite(Cfg) ->
Cfg. Cfg.
end_per_suite(Cfg) -> end_per_suite(Cfg) ->
emqx_mgmt_data_backup:delete_all_backup_file(),
emqx_ct_helpers:stop_apps([emqx_management, emqx_rule_engine]), emqx_ct_helpers:stop_apps([emqx_management, emqx_rule_engine]),
Cfg. Cfg.
get_data_path() -> get_data_path() ->
emqx_ct_helpers:deps_path(emqx_management, "test/emqx_bridge_mqtt_data_export_import_SUITE_data/"). emqx_ct_helpers:deps_path(emqx_management, "test/emqx_bridge_mqtt_data_export_import_SUITE_data/").
import(FilePath, Version) -> import(FilePath0, Version) ->
ok = emqx_mgmt_data_backup:import(get_data_path() ++ "/" ++ FilePath, <<"{}">>), Filename = filename:basename(FilePath0),
FilePath = filename:join([get_data_path(), FilePath0]),
{ok, Bin} = file:read_file(FilePath),
ok = emqx_mgmt_data_backup:upload_backup_file(Filename, Bin),
timer:sleep(500), timer:sleep(500),
lists:foreach(fun(#resource{id = Id, config = Config} = _Resource) -> lists:foreach(fun(#resource{id = Id, config = Config} = _Resource) ->
case Id of case Id of
@ -181,4 +185,4 @@ remove_resources() ->
lists:foreach(fun(#resource{id = Id}) -> lists:foreach(fun(#resource{id = Id}) ->
emqx_rule_engine:delete_resource(Id) emqx_rule_engine:delete_resource(Id)
end, emqx_rule_registry:get_resources()), end, emqx_rule_registry:get_resources()),
timer:sleep(500). timer:sleep(500).

View File

@ -719,9 +719,10 @@ t_data_import_content(_) ->
Dir = emqx_mgmt_data_backup:backup_dir(), Dir = emqx_mgmt_data_backup:backup_dir(),
{ok, Bin} = file:read_file(filename:join(Dir, Filename)), {ok, Bin} = file:read_file(filename:join(Dir, Filename)),
Content = emqx_json:decode(Bin), Content = emqx_json:decode(Bin),
ct:pal("Content:::: ~p~n", [Content]),
?assertMatch({ok, "{\"code\":0}"}, ?assertMatch({ok, "{\"code\":0}"},
request_api(post, api_path(["data","import"]), [], auth_header_(), Content)), request_api(post, api_path(["data","import"]), [], auth_header_(), Content)),
emqx_mgmt_data_backup:delete_all_backup_file(), emqx_mgmt_data_backup:delete_all_backup_file(),
application:stop(emqx_rule_engine), application:stop(emqx_rule_engine),
application:stop(emqx_dashboard). application:stop(emqx_dashboard).

View File

@ -46,8 +46,11 @@ remove_resource(Id) ->
emqx_rule_registry:remove_resource(Id), emqx_rule_registry:remove_resource(Id),
emqx_rule_registry:remove_resource_params(Id). emqx_rule_registry:remove_resource_params(Id).
import(FilePath, Version) -> import(FilePath0, Version) ->
ok = emqx_mgmt_data_backup:import(get_data_path() ++ "/" ++ FilePath, <<"{}">>), Filename = filename:basename(FilePath0),
FilePath = filename:join([get_data_path(), FilePath0]),
{ok, Bin} = file:read_file(FilePath),
ok = emqx_mgmt_data_backup:upload_backup_file(Filename, Bin),
lists:foreach(fun(#resource{id = Id, config = Config} = _Resource) -> lists:foreach(fun(#resource{id = Id, config = Config} = _Resource) ->
case Id of case Id of
<<"webhook">> -> <<"webhook">> ->