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

test: fix flaky test emqx_ctl_SUITE.erl

This commit is contained in:
Zaiming (Stone) Shi 2022-04-28 18:32:52 +02:00
parent 828f1b0730
commit a4d0a9266a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx/src/emqx_ctl.erl
View File

@ -75,7 +75,13 @@ start_link() ->
gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
-spec stop() -> ok. -spec stop() -> ok.
stop() -> gen_server:stop(?SERVER). stop() ->
try
gen_server:stop(?SERVER)
catch
exit:R when R =:= noproc orelse R =:= timeout ->
ok
end.
-spec register_command(cmd(), {module(), atom()}) -> ok. -spec register_command(cmd(), {module(), atom()}) -> ok.
register_command(Cmd, MF) when is_atom(Cmd) -> register_command(Cmd, MF) when is_atom(Cmd) ->

7
apps/emqx/test/emqx_ctl_SUITE.erl
View File

@ -107,9 +107,14 @@ cmd2_fun(["arg1", "arg2"]) -> ok;
cmd2_fun(["arg1", "badarg"]) -> error(badarg). cmd2_fun(["arg1", "badarg"]) -> error(badarg).
with_ctl_server(Fun) -> with_ctl_server(Fun) ->
ok = emqx_ctl:stop(),
{ok, Pid} = emqx_ctl:start_link(), {ok, Pid} = emqx_ctl:start_link(),
try
_ = Fun(Pid), _ = Fun(Pid),
ok = emqx_ctl:stop(). ok
after
ok = emqx_ctl:stop()
end.
mock_print() -> mock_print() ->
%% proxy usage/1,2 and print/1,2 to format_xx/1,2 funcs %% proxy usage/1,2 and print/1,2 to format_xx/1,2 funcs