From b3e7e51094daf95d5ad3cee60db920300f793f11 Mon Sep 17 00:00:00 2001 From: Andrew Mayorov Date: Mon, 13 Mar 2023 18:12:41 +0300 Subject: [PATCH] test(bridge): drop unnecessary cleanup routines Since `end_per_testcase` cleans out all the resources anyway. --- .../emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl index e2c9382db..bd6af9323 100644 --- a/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl +++ b/apps/emqx_bridge/test/emqx_bridge_mqtt_SUITE.erl @@ -19,7 +19,6 @@ -compile(export_all). -import(emqx_dashboard_api_test_helpers, [request/4, uri/1]). --import(emqx_common_test_helpers, [on_exit/1]). -include("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -164,9 +163,9 @@ init_per_testcase(_, Config) -> {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000), ok = snabbkaffe:start_trace(), Config. + end_per_testcase(_, _Config) -> clear_resources(), - emqx_common_test_helpers:call_janitor(), snabbkaffe:stop(), ok. @@ -710,13 +709,6 @@ t_mqtt_conn_bridge_egress_reconnect(_) -> } ), - on_exit(fun() -> - %% delete the bridge - {ok, 204, <<>>} = request(delete, uri(["bridges", BridgeIDEgress]), []), - {ok, 200, <<"[]">>} = request(get, uri(["bridges"]), []), - ok - end), - %% we now test if the bridge works as expected LocalTopic = <>, RemoteTopic = <>, @@ -827,13 +819,6 @@ t_mqtt_conn_bridge_egress_async_reconnect(_) -> } ), - on_exit(fun() -> - %% delete the bridge - {ok, 204, <<>>} = request(delete, uri(["bridges", BridgeIDEgress]), []), - {ok, 200, <<"[]">>} = request(get, uri(["bridges"]), []), - ok - end), - Self = self(), LocalTopic = <>, RemoteTopic = <>,