From ba319e1159146eb3c67094d962301d5cae4ad1e5 Mon Sep 17 00:00:00 2001
From: Ilya Averyanov <av@rubybox.ru>
Date: Mon, 18 Oct 2021 12:08:16 +0300
Subject: [PATCH] fix(mnesia_acl): upgrade snabbkaffe and use ?check_trace

---
 .../test/emqx_acl_mnesia_SUITE.erl            | 45 ++++++++++---------
 rebar.config                                  |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/apps/emqx_auth_mnesia/test/emqx_acl_mnesia_SUITE.erl b/apps/emqx_auth_mnesia/test/emqx_acl_mnesia_SUITE.erl
index 72f51e0a6..eb1ea74f3 100644
--- a/apps/emqx_auth_mnesia/test/emqx_acl_mnesia_SUITE.erl
+++ b/apps/emqx_auth_mnesia/test/emqx_acl_mnesia_SUITE.erl
@@ -239,8 +239,7 @@ t_migration_concurrency(_Config) ->
         end,
         fun(_, Trace) ->
             ?assertMatch([_], ?of_kind(emqx_acl_mnesia_migrator_record_missed, Trace))
-        end
-    ),
+        end),
 
     ?assert(emqx_acl_mnesia_migrator:is_old_table_migrated()),
     ?assertEqual([], emqx_acl_mnesia_db:all_acls()).
@@ -251,27 +250,30 @@ t_old_and_new_acl_migration_by_migrator(_Config) ->
 
     meck:new(fake_nodes, [non_strict]),
     meck:expect(fake_nodes, all, fun() -> [node(), 'somebadnode@127.0.0.1'] end),
-    snabbkaffe:start_trace(),
 
-    % check all nodes every 30 ms
-    {ok, _} = emqx_acl_mnesia_migrator:start_link(#{
-        name => ct_migrator,
-        check_nodes_interval => 30,
-        get_nodes => fun fake_nodes:all/0
-    }),
-    timer:sleep(100),
+    ?check_trace(
+        begin
+            % check all nodes every 30 ms
+            {ok, _} = emqx_acl_mnesia_migrator:start_link(#{
+                name => ct_migrator,
+                check_nodes_interval => 30,
+                get_nodes => fun fake_nodes:all/0
+            }),
+            timer:sleep(100)
+        end,
+        fun(_, Trace) ->
+            ?assertEqual([], ?of_kind(emqx_acl_mnesia_migrator_start_migration, Trace))
+        end),
 
-    Trace0 = snabbkaffe:collect_trace(),
-    ?assertEqual([], ?of_kind(emqx_acl_mnesia_migrator_start_migration, Trace0)),
+    ?check_trace(
+        begin
+            meck:expect(fake_nodes, all, fun() -> [node()] end),
+            timer:sleep(100)
+        end,
+        fun(_, Trace) ->
+            ?assertMatch([_], ?of_kind(emqx_acl_mnesia_migrator_finish, Trace))
+        end),
 
-
-    meck:expect(fake_nodes, all, fun() -> [node()] end),
-    timer:sleep(100),
-
-    Trace1 = snabbkaffe:collect_trace(),
-    ?assertMatch([_], ?of_kind(emqx_acl_mnesia_migrator_finish, Trace1)),
-
-    snabbkaffe:stop(),
     meck:unload(fake_nodes),
 
     ?assertEqual(combined_conflicting_records(), emqx_acl_mnesia_db:all_acls()),
@@ -289,8 +291,7 @@ t_old_and_new_acl_migration_repeated_by_migrator(_Config) ->
         fun(_, Trace) ->
             ?assertEqual([], ?of_kind(emqx_acl_mnesia_migrator_start_migration, Trace)),
             ?assertMatch([_], ?of_kind(emqx_acl_mnesia_migrator_finish, Trace))
-        end
-    ).
+        end).
 
 t_start_stop_supervised(_Config) ->
     ?assertEqual(undefined, whereis(emqx_acl_mnesia_migrator)),
diff --git a/rebar.config b/rebar.config
index f56e8e2c2..c49733535 100644
--- a/rebar.config
+++ b/rebar.config
@@ -55,7 +55,7 @@
     , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}
     , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1
     , {getopt, "1.0.1"}
-    , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}}
+    , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.15.0"}}}
     ]}.
 
 {xref_ignores,