From 4416122cf37db736911f3d2da1faf3cfb5dc27f4 Mon Sep 17 00:00:00 2001 From: William Yang Date: Thu, 25 May 2023 16:41:46 +0200 Subject: [PATCH] test: fix longname/shortname --- apps/emqx/test/emqx_shared_sub_SUITE.erl | 25 +++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/apps/emqx/test/emqx_shared_sub_SUITE.erl b/apps/emqx/test/emqx_shared_sub_SUITE.erl index e66b42bc8..7c6c144eb 100644 --- a/apps/emqx/test/emqx_shared_sub_SUITE.erl +++ b/apps/emqx/test/emqx_shared_sub_SUITE.erl @@ -21,6 +21,7 @@ -include_lib("emqx/include/emqx.hrl"). -include_lib("eunit/include/eunit.hrl"). +-include_lib("common_test/include/ct.hrl"). -define(SUITE, ?MODULE). @@ -46,12 +47,30 @@ all() -> emqx_common_test_helpers:all(?SUITE). init_per_suite(Config) -> - net_kernel:start(['master@127.0.0.1', longnames]), + DistPid = + case net_kernel:nodename() of + ignored -> + %% calling `net_kernel:start' without `epmd' + %% running will result in a failure. + emqx_common_test_helpers:start_epmd(), + {ok, Pid} = net_kernel:start(['master@127.0.0.1', longnames]), + ct:pal("start epmd, node name: ~p", [node()]), + Pid; + _ -> + undefined + end, emqx_common_test_helpers:boot_modules(all), emqx_common_test_helpers:start_apps([]), - Config. + [{dist_pid, DistPid} | Config]. -end_per_suite(_Config) -> +end_per_suite(Config) -> + DistPid = ?config(dist_pid, Config), + case DistPid of + Pid when is_pid(Pid) -> + net_kernel:stop(); + _ -> + ok + end, emqx_common_test_helpers:stop_apps([]). init_per_testcase(Case, Config) ->