From c883e4b36a1246ef8dcd07bfee64e64550af4880 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Fri, 24 Feb 2023 18:16:35 +0300
Subject: [PATCH] test: drop custom `loop_wait` in favor of snabkaffe's
 `?retry`

---
 .../test/emqx_resource_SUITE.erl              | 49 ++++++++-----------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/apps/emqx_resource/test/emqx_resource_SUITE.erl b/apps/emqx_resource/test/emqx_resource_SUITE.erl
index 9b1031c42..af72e86f9 100644
--- a/apps/emqx_resource/test/emqx_resource_SUITE.erl
+++ b/apps/emqx_resource/test/emqx_resource_SUITE.erl
@@ -1539,23 +1539,26 @@ t_async_reply_multi_eval(_Config) ->
         end,
         #{}
     ),
-    F = fun() ->
-        Metrics = tap_metrics(?LINE),
-        #{
-            counters := Counters,
-            gauges := #{queuing := 0, inflight := 0}
-        } = Metrics,
-        #{
-            matched := Matched,
-            success := Success,
-            dropped := Dropped,
-            late_reply := LateReply,
-            failed := Failed
-        } = Counters,
-        ?assertEqual(TotalQueries, Matched - 1),
-        ?assertEqual(Matched, Success + Dropped + LateReply + Failed)
-    end,
-    loop_wait(F, _Interval = 5, TotalTime).
+    ?retry(
+        ResumeInterval,
+        TotalTime div ResumeInterval,
+        begin
+            Metrics = tap_metrics(?LINE),
+            #{
+                counters := Counters,
+                gauges := #{queuing := 0, inflight := 0}
+            } = Metrics,
+            #{
+                matched := Matched,
+                success := Success,
+                dropped := Dropped,
+                late_reply := LateReply,
+                failed := Failed
+            } = Counters,
+            ?assertEqual(TotalQueries, Matched - 1),
+            ?assertEqual(Matched, Success + Dropped + LateReply + Failed)
+        end
+    ).
 
 t_retry_async_inflight_batch(_Config) ->
     ResumeInterval = 1_000,
@@ -2622,15 +2625,3 @@ assert_async_retry_fail_then_succeed_inflight(Trace) ->
         )
     ),
     ok.
-
-loop_wait(F, Interval, TotalTime) when Interval >= TotalTime ->
-    %% do it for the last time
-    F();
-loop_wait(F, Interval, TotalTime) ->
-    try
-        F()
-    catch
-        _:_ ->
-            timer:sleep(Interval),
-            loop_wait(F, Interval, TotalTime - Interval)
-    end.