From a9efdaeacd0d5934b37e9a846a39755fcf6f1048 Mon Sep 17 00:00:00 2001 From: z8674558 Date: Sat, 29 May 2021 20:44:39 +0900 Subject: [PATCH] fix(emqx_rule_engine_SUITE): use emqx_ct_helpers:read_schema_configs --- apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl index 2e82ef0cd..d9675cc6b 100644 --- a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl +++ b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl @@ -2559,18 +2559,10 @@ start_apps() -> local_path("etc/emqx_rule_engine.conf")}]]. start_apps(App, SchemaFile, ConfigFile) -> - read_schema_configs(App, SchemaFile, ConfigFile), + emqx_ct_helpers:read_schema_configs(SchemaFile, ConfigFile), set_special_configs(App), {ok, _} = application:ensure_all_started(App). -read_schema_configs(App, SchemaFile, ConfigFile) -> - ct:pal("Read configs - SchemaFile: ~p, ConfigFile: ~p", [SchemaFile, ConfigFile]), - Schema = cuttlefish_schema:files([SchemaFile]), - {ok, Conf} = hocon:load(ConfigFile, #{format => proplists}), - NewConfig = cuttlefish_generator:map(Schema, Conf), - Vals = proplists:get_value(App, NewConfig, []), - [application:set_env(App, Par, Value) || {Par, Value} <- Vals]. - deps_path(App, RelativePath) -> %% Note: not lib_dir because etc dir is not sym-link-ed to _build dir %% but priv dir is