fix(test): fix test case fail

emqx · Jun 23, 2021 · f83c96f · f83c96f
1 parent 6645df4
commit f83c96f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/apps/emqx_telemetry/src/emqx_telemetry.erl b/apps/emqx_telemetry/src/emqx_telemetry.erl
@@ -142,9 +142,9 @@ get_telemetry() ->
 init([Opts]) ->
     State = #state{url = ?TELEMETRY_URL,
                    report_interval = timer:seconds(?REPORT_INTERVAR)},
-    Enabled = proplists:get_value(enabled, Opts, true),
     NState = case mnesia:dirty_read(?TELEMETRY, ?UNIQUE_ID) of
                  [] ->
+                     Enabled = proplists:get_value(enabled, Opts, true),
                      UUID = generate_uuid(),
                      mnesia:dirty_write(?TELEMETRY, #telemetry{id = ?UNIQUE_ID,
                                                                uuid = UUID,

diff --git a/apps/emqx_telemetry/test/emqx_telemetry_SUITE.erl b/apps/emqx_telemetry/test/emqx_telemetry_SUITE.erl
@@ -29,11 +29,20 @@ all() -> emqx_ct:all(?MODULE).
 
 init_per_testcase(_, Config) ->
     emqx_ct_helpers:boot_modules(all),
-    emqx_ct_helpers:start_apps([emqx_modules, emqx_telemetry]),
+    emqx_ct_helpers:start_apps([emqx_telemetry], fun set_special_configs/1),
     Config.
 
 end_per_testcase(_, _Config) ->
-    emqx_ct_helpers:stop_apps([emqx_telemetry, emqx_modules]).
+    emqx_ct_helpers:stop_apps([emqx_telemetry]).
+
+set_special_configs(emqx_telemetry) ->
+    application:set_env(emqx, plugins_etc_dir,
+                        emqx_ct_helpers:deps_path(emqx_telemetry, "test")),
+    Conf = #{<<"emqx_telemetry">> => #{<<"enabled">> => true}},
+    ok = file:write_file(filename:join(emqx:get_env(plugins_etc_dir), 'emqx_telemetry.conf'), jsx:encode(Conf)),
+    ok;
+set_special_configs(_App) ->
+    ok.
 
 t_uuid(_) ->
     UUID = emqx_telemetry:generate_uuid(),