From 6de0bbe76a6611c52d5b59204ce718c03ca1c135 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 15 Aug 2023 16:20:36 -0300 Subject: [PATCH] test(refactor): always allocate listeners for emqx app --- apps/emqx/test/emqx_cth_cluster.erl | 2 +- apps/emqx/test/emqx_persistent_messages_SUITE.erl | 1 - apps/emqx_durable_storage/test/emqx_ds_SUITE.erl | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/emqx/test/emqx_cth_cluster.erl b/apps/emqx/test/emqx_cth_cluster.erl index cbbad0aa2..1a83056cb 100644 --- a/apps/emqx/test/emqx_cth_cluster.erl +++ b/apps/emqx/test/emqx_cth_cluster.erl @@ -245,7 +245,7 @@ default_appspec(emqx_conf, Spec, _NodeSpecs) -> listeners => allocate_listener_ports([tcp, ssl, ws, wss], Spec) } }; -default_appspec(emqx, Spec = #{listeners := true}, _NodeSpecs) -> +default_appspec(emqx, Spec, _NodeSpecs) -> #{config => #{listeners => allocate_listener_ports([tcp, ssl, ws, wss], Spec)}}; default_appspec(_App, _, _) -> #{}. diff --git a/apps/emqx/test/emqx_persistent_messages_SUITE.erl b/apps/emqx/test/emqx_persistent_messages_SUITE.erl index 9d814aad6..81cc3dade 100644 --- a/apps/emqx/test/emqx_persistent_messages_SUITE.erl +++ b/apps/emqx/test/emqx_persistent_messages_SUITE.erl @@ -266,7 +266,6 @@ cluster() -> Spec = #{ role => core, join_to => emqx_cth_cluster:node_name(Node1), - listeners => true, apps => app_specs() }, [ diff --git a/apps/emqx_durable_storage/test/emqx_ds_SUITE.erl b/apps/emqx_durable_storage/test/emqx_ds_SUITE.erl index 73eb28d85..c79856fc7 100644 --- a/apps/emqx_durable_storage/test/emqx_ds_SUITE.erl +++ b/apps/emqx_durable_storage/test/emqx_ds_SUITE.erl @@ -57,7 +57,6 @@ cluster(#{n := N}) -> Spec = #{ role => core, join_to => emqx_cth_cluster:node_name(Node1), - listeners => true, apps => app_specs() }, [