Просмотр исходного кода

test(emqx_recon): stop emqx correctly in the test case

zhanghongtong 5 лет назад
Родитель
Сommit
a364758e2a

+ 1 - 1
Makefile

@@ -1,4 +1,4 @@
-REBAR_VERSION = 3.14.3-emqx-3
+REBAR_VERSION = 3.14.3-emqx-4
 REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)

+ 2 - 12
apps/emqx_recon/test/emqx_recon_SUITE.erl

@@ -36,13 +36,11 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    [start_apps(App, DataDir) || App <- [emqx, emqx_recon]],
+    emqx_ct_helpers:start_apps([emqx_recon]),
     Config.
 
 end_per_suite(_Config) ->
-    application:stop(emqx_recon),
-    application:stop(emqx).
+    emqx_ct_helpers:stop_apps([emqx_recon]).
 
 cli_memory(_) ->
     mock_print(),
@@ -104,14 +102,6 @@ cli_remote_load(_) ->
 cli_usage(_) ->
     emqx_recon_cli:cmd(["usage"]).
 
-start_apps(App, DataDir) ->
-    Schema = cuttlefish_schema:files([filename:join([DataDir, atom_to_list(App) ++ ".schema"])]),
-    Conf = conf_parse:file(filename:join([DataDir, atom_to_list(App) ++ ".conf"])),
-    NewConfig = cuttlefish_generator:map(Schema, Conf),
-    Vals = proplists:get_value(App, NewConfig),
-    [application:set_env(App, Par, Value) || {Par, Value} <- Vals],
-    application:ensure_all_started(App).
-
 mock_print() ->
     catch meck:unload(emqx_ctl),
     meck:new(emqx_ctl, [non_strict, passthrough]),

Разница между файлами не показана из-за своего большого размера
+ 0 - 466
apps/emqx_recon/test/emqx_recon_SUITE_data/emqx.conf


Разница между файлами не показана из-за своего большого размера
+ 0 - 1060
apps/emqx_recon/test/emqx_recon_SUITE_data/emqx.schema


+ 0 - 10
apps/emqx_recon/test/emqx_recon_SUITE_data/emqx_recon.conf

@@ -1,10 +0,0 @@
-##--------------------------------------------------------------------
-## Recon Plugin
-##--------------------------------------------------------------------
-
-## Global GC Interval
-## h - hour
-## m - minute
-## s - second
-recon.gc_interval = 5m
-

+ 0 - 8
apps/emqx_recon/test/emqx_recon_SUITE_data/emqx_recon.schema

@@ -1,8 +0,0 @@
-%%-*- mode: erlang -*-
-%% emqx_recon config mapping
-
-{mapping, "recon.gc_interval", "emqx_recon.gc_interval", [
-  {default, "5m"},
-  {datatype, {duration, ms}}
-]}.
-