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

Fix flaky tests and properties

apps/emqx/test/props/prop_emqx_rpc.erl

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

apps/emqx_modules/test/emqx_telemetry_SUITE.erl

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

apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl

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