浏览代码

test: fix delayed-pubish test case flakyness

Zaiming (Stone) Shi 2 年之前
父节点
当前提交
06e25f5c72
共有 1 个文件被更改,包括 4 次插入12 次删除
  1. 4 12
      apps/emqx_modules/test/emqx_telemetry_SUITE.erl

+ 4 - 12
apps/emqx_modules/test/emqx_telemetry_SUITE.erl

@@ -455,16 +455,6 @@ t_num_clients(_Config) ->
     ok.
     ok.
 
 
 t_advanced_mqtt_features(_) ->
 t_advanced_mqtt_features(_) ->
-    try
-        ok = test_advanced_mqtt_features()
-    catch
-        _:_ ->
-            %% delayed messages' metrics might not be reported yet
-            timer:sleep(1000),
-            test_advanced_mqtt_features()
-    end.
-
-test_advanced_mqtt_features() ->
     {ok, TelemetryData} = emqx_telemetry:get_telemetry(),
     {ok, TelemetryData} = emqx_telemetry:get_telemetry(),
     AdvFeats = get_value(advanced_mqtt_features, TelemetryData),
     AdvFeats = get_value(advanced_mqtt_features, TelemetryData),
     ?assertEqual(
     ?assertEqual(
@@ -659,8 +649,10 @@ mock_advanced_mqtt_features() ->
 
 
     lists:foreach(
     lists:foreach(
         fun(N) ->
         fun(N) ->
-            Num = integer_to_binary(N),
-            Message = emqx_message:make(<<"$delayed/", Num/binary, "/delayed">>, <<"payload">>),
+            DelaySec = integer_to_binary(N + 10),
+            Message = emqx_message:make(
+                <<"$delayed/", DelaySec/binary, "/delayed">>, <<"payload">>
+            ),
             {stop, _} = emqx_delayed:on_message_publish(Message)
             {stop, _} = emqx_delayed:on_message_publish(Message)
         end,
         end,
         lists:seq(1, 4)
         lists:seq(1, 4)