From 422597a441a8f62382ac93c59201410eae3d70a5 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Mon, 13 Mar 2023 10:32:35 -0300
Subject: [PATCH] test: fix flaky tests

---
 .../test/emqx_resource_SUITE.erl              | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/apps/emqx_resource/test/emqx_resource_SUITE.erl b/apps/emqx_resource/test/emqx_resource_SUITE.erl
index af72e86f9..c8b5ff183 100644
--- a/apps/emqx_resource/test/emqx_resource_SUITE.erl
+++ b/apps/emqx_resource/test/emqx_resource_SUITE.erl
@@ -250,8 +250,15 @@ t_batch_query_counter(_) ->
             ok
         end,
         fun(Trace) ->
-            QueryTrace = ?of_kind(call_batch_query, Trace),
-            ?assertMatch([#{batch := BatchReq} | _] when length(BatchReq) > 1, QueryTrace)
+            QueryTrace = [
+                Event
+             || Event = #{
+                    ?snk_kind := call_batch_query,
+                    batch := BatchReq
+                } <- Trace,
+                length(BatchReq) > 1
+            ],
+            ?assertMatch([_ | _], QueryTrace)
         end
     ),
     {ok, NMsgs} = emqx_resource:query(?ID, get_counter),
@@ -602,19 +609,18 @@ t_query_counter_async_inflight_batch(_) ->
                 5_000
             ),
         fun(Trace) ->
-            QueryTrace = ?of_kind(call_batch_query_async, Trace),
-            ?assertMatch(
-                [
-                    #{
-                        batch := [
-                            {query, _, {inc_counter, 1}, _, _},
-                            {query, _, {inc_counter, 1}, _, _}
-                        ]
-                    }
-                    | _
-                ],
-                QueryTrace
-            )
+            QueryTrace = [
+                Event
+             || Event = #{
+                    ?snk_kind := call_batch_query_async,
+                    batch := [
+                        {query, _, {inc_counter, 1}, _, _},
+                        {query, _, {inc_counter, 1}, _, _}
+                    ]
+                } <-
+                    Trace
+            ],
+            ?assertMatch([_ | _], QueryTrace)
         end
     ),
     tap_metrics(?LINE),