Merge pull request #7948 from zmstone/0513-fix-flaky-test

0513 fix flaky test

apps/emqx/test/emqx_ctl_SUITE.erl

@@ -25,6 +25,8 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
+    %% ensure stopped, this suite tests emqx_ctl process independently
+    application:stop(emqx),
     ok = emqx_logger:set_log_level(emergency),
     Config.
 

apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl

@@ -105,6 +105,7 @@ t_monitor_reset(_) ->
         ?assert(maps:is_key(atom_to_binary(Key, utf8), Rate))
      || Key <- maps:values(?DELTA_SAMPLER_RATE_MAP) ++ ?GAUGE_SAMPLER_LIST
     ],
+    timer:sleep(?DEFAULT_SAMPLE_INTERVAL * 2 * 1000 + 20),
     {ok, Samplers} = request(["monitor"], "latest=1"),
     ?assertEqual(1, erlang:length(Samplers)),
     ok.
@@ -158,7 +159,7 @@ auth_header_() ->
 
 restart_monitor() ->
     OldMonitor = erlang:whereis(emqx_dashboard_monitor),
-    erlang:exit(OldMonitor, killed),
+    erlang:exit(OldMonitor, kill),
     ?assertEqual(ok, wait_new_monitor(OldMonitor, 10)).
 
 wait_new_monitor(_OldMonitor, Count) when Count =< 0 -> timeout;

apps/emqx_gateway/test/emqx_gateway_auth_ct.erl

@@ -40,7 +40,7 @@
     ]
 ).
 
--include("emqx_authn.hrl").
+-include_lib("emqx_authn/include/emqx_authn.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("emqx/include/emqx_placeholder.hrl").