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

Merge pull request #7678 from thalesmg/fix-flaky-prop-and-test 

Fix flaky tests and properties
This commit is contained in:
Thales Macedo Garitezi 2022-04-20 07:41:24 -03:00 committed by GitHub
parent f8d046b259 ec1ff14759
commit 097b38e418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/test/props/prop_emqx_rpc.erl
View File

@ -124,7 +124,7 @@ do_teardown(_) ->
ok = application:stop(gen_rpc), ok = application:stop(gen_rpc),
ok = meck:unload(gen_rpc), ok = meck:unload(gen_rpc),
%% wait for tcp close %% wait for tcp close
timer:sleep(1500). timer:sleep(2500).
ensure_distributed_nodename() -> ensure_distributed_nodename() ->
case net_kernel:start([?NODENAME]) of case net_kernel:start([?NODENAME]) of

11
apps/emqx_modules/test/emqx_telemetry_SUITE.erl
View File

@ -662,7 +662,12 @@ host() ->
Host. Host.
ebin_path() -> ebin_path() ->
string:join(["-pa" | lists:filter(fun is_lib/1, code:get_path())], " "). string:join(["-pa" | paths()], " ").
is_lib(Path) -> paths() ->
string:prefix(Path, code:lib_dir()) =:= nomatch. [
Path
|| Path <- code:get_path(),
string:prefix(Path, code:lib_dir()) =:= nomatch,
string:str(Path, "_build/default/plugins") =:= 0
].

1
apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
View File

@ -56,6 +56,7 @@ init_per_suite(Config) ->
end_per_suite(_Config) -> end_per_suite(_Config) ->
emqx_common_test_helpers:stop_apps([emqx_conf, emqx_dashboard, emqx_modules]), emqx_common_test_helpers:stop_apps([emqx_conf, emqx_dashboard, emqx_modules]),
application:stop(gen_rpc),
ok. ok.
set_special_configs(emqx_dashboard) -> set_special_configs(emqx_dashboard) ->