From 37aeb28a798de8f459d5b284a1f24c8b4de29455 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 22 Nov 2021 13:48:22 +0800
Subject: [PATCH] fix(connector): test case conflict

---
 apps/emqx/src/emqx_shared_sub.erl                     | 1 +
 apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl       | 4 +++-
 apps/emqx_connector/test/emqx_connector_api_SUITE.erl | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/emqx/src/emqx_shared_sub.erl b/apps/emqx/src/emqx_shared_sub.erl
index 79a7d5522..2c91bbbcc 100644
--- a/apps/emqx/src/emqx_shared_sub.erl
+++ b/apps/emqx/src/emqx_shared_sub.erl
@@ -292,6 +292,7 @@ subscribers(Group, Topic) ->
 %%--------------------------------------------------------------------
 
 init([]) ->
+    mria:wait_for_tables([?TAB]),
     {ok, _} = mnesia:subscribe({table, ?TAB, simple}),
     {atomic, PMon} = mria:transaction(?SHARED_SUB_SHARD, fun init_monitors/0),
     ok = emqx_tables:new(?SHARED_SUBS, [protected, bag]),
diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
index af3ae1c07..23d4691f5 100644
--- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
+++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
@@ -57,12 +57,14 @@ init_per_suite(Config) ->
         }]
     }),
     _ = application:load(emqx_conf),
+    %% some testcases (may from other app) already get emqx_connector started
+    _ = application:stop(emqx_resource),
+    _ = application:stop(emqx_connector),
     ok = emqx_common_test_helpers:start_apps([emqx_bridge, emqx_dashboard]),
     ok = emqx_config:init_load(emqx_bridge_schema, ?CONF_DEFAULT),
     Config.
 
 end_per_suite(_Config) ->
-    ok = ekka:stop(),
     emqx_common_test_helpers:stop_apps([emqx_bridge, emqx_dashboard]),
     ok.
 
diff --git a/apps/emqx_connector/test/emqx_connector_api_SUITE.erl b/apps/emqx_connector/test/emqx_connector_api_SUITE.erl
index e82d0bf7d..b163d1cf2 100644
--- a/apps/emqx_connector/test/emqx_connector_api_SUITE.erl
+++ b/apps/emqx_connector/test/emqx_connector_api_SUITE.erl
@@ -68,15 +68,16 @@ init_per_suite(Config) ->
         }]
     }),
     _ = application:load(emqx_conf),
+    %% some testcases (may from other app) already get emqx_connector started
+    _ = application:stop(emqx_resource),
+    _ = application:stop(emqx_connector),
     ok = emqx_common_test_helpers:start_apps([emqx_connector, emqx_bridge, emqx_dashboard]),
     ok = emqx_config:init_load(emqx_connector_schema, ?CONF_DEFAULT),
     ok = emqx_config:init_load(emqx_bridge_schema, ?BRIDGE_CONF_DEFAULT),
     Config.
 
 end_per_suite(_Config) ->
-    ok = ekka:stop(),
     emqx_common_test_helpers:stop_apps([emqx_connector, emqx_bridge, emqx_dashboard]),
-    application:unload(emqx_conf),
     ok.
 
 init_per_testcase(_, Config) ->