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

fix(test): remove emqx:get_env from lwm2m and telemetry

This commit is contained in:
Shawn 2021-07-23 10:14:14 +08:00
parent 7c5caee89c
commit 419036bd9a
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/emqx_gateway/src/lwm2m/emqx_lwm2m_xml_object_db.erl
View File

@ -88,10 +88,7 @@ stop() ->
init([]) -> init([]) ->
_ = ets:new(?LWM2M_OBJECT_DEF_TAB, [set, named_table, protected]), _ = ets:new(?LWM2M_OBJECT_DEF_TAB, [set, named_table, protected]),
_ = ets:new(?LWM2M_OBJECT_NAME_TO_ID_TAB, [set, named_table, protected]), _ = ets:new(?LWM2M_OBJECT_NAME_TO_ID_TAB, [set, named_table, protected]),
PluginsEtcDir = emqx:get_env(plugins_etc_dir), load(emqx_config:get([emqx_lwm2m, xml_dir])),
DefBaseDir = re:replace(PluginsEtcDir, "plugins", "lwm2m_xml", [{return, list}]),
BaseDir = application:get_env(emqx_lwm2m, xml_dir, DefBaseDir),
load(BaseDir),
{ok, #state{}}. {ok, #state{}}.
handle_call(_Request, _From, State) -> handle_call(_Request, _From, State) ->

9
apps/emqx_modules/test/emqx_mod_telemetry_SUITE.erl
View File

@ -37,15 +37,6 @@ init_per_suite(Config) ->
end_per_suite(_Config) -> end_per_suite(_Config) ->
emqx_ct_helpers:stop_apps([emqx_modules]). emqx_ct_helpers:stop_apps([emqx_modules]).
set_special_configs(emqx_modules) ->
application:set_env(emqx, plugins_etc_dir,
emqx_ct_helpers:deps_path(emqx_modules, "test")),
Conf = #{},
ok = file:write_file(filename:join(emqx:get_env(plugins_etc_dir), 'emqx_modules.conf'), jsx:encode(Conf)),
ok;
set_special_configs(_App) ->
ok.
t_uuid(_) -> t_uuid(_) ->
UUID = emqx_mod_telemetry:generate_uuid(), UUID = emqx_mod_telemetry:generate_uuid(),
Parts = binary:split(UUID, <<"-">>, [global, trim]), Parts = binary:split(UUID, <<"-">>, [global, trim]),