From 05d14119fa567d01389e7d3cdfd2f4d3ee4d8fb9 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 13 Feb 2023 13:08:22 +0800
Subject: [PATCH] fix: keep v4.4 files sync with e4.4

---
 apps/emqx_exproto/etc/emqx_exproto.conf  |  2 +-
 lib-ce/emqx_modules/src/emqx_modules.erl |  2 +-
 scripts/update_appup.escript             |  5 ++++-
 test/emqx_SUITE.erl                      |  1 +
 test/emqx_node_helpers.erl               | 14 ++++++++++----
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/emqx_exproto/etc/emqx_exproto.conf b/apps/emqx_exproto/etc/emqx_exproto.conf
index 712442eb9..249530c58 100644
--- a/apps/emqx_exproto/etc/emqx_exproto.conf
+++ b/apps/emqx_exproto/etc/emqx_exproto.conf
@@ -146,7 +146,7 @@ exproto.listener.protoname.reuseaddr = true
 ## See: http://erlang.org/doc/man/ssl.html
 ##
 ## Value: String, seperated by ','
-#exproto.listener.protoname.tls_versions = tlsv1.2,tlsv1.1,tlsv1
+#exproto.listener.protoname.tls_versions = tls1.3,tlsv1.2,tlsv1.1
 
 ## Path to the file containing the user's private PEM-encoded key.
 ##
diff --git a/lib-ce/emqx_modules/src/emqx_modules.erl b/lib-ce/emqx_modules/src/emqx_modules.erl
index 7103321d7..e1de9ecf6 100644
--- a/lib-ce/emqx_modules/src/emqx_modules.erl
+++ b/lib-ce/emqx_modules/src/emqx_modules.erl
@@ -208,7 +208,7 @@ cli(["list"]) ->
     lists:foreach(fun({Name, Active}) ->
                     emqx_ctl:print("Module(~s, description=~s, active=~s)~n",
                         [Name, Name:description(), Active])
-                  end, emqx_modules:list());
+                  end, list());
 
 cli(["load", Name]) ->
     case emqx_modules:load(list_to_atom(Name)) of
diff --git a/scripts/update_appup.escript b/scripts/update_appup.escript
index 3cda437d2..07f38873d 100755
--- a/scripts/update_appup.escript
+++ b/scripts/update_appup.escript
@@ -580,7 +580,10 @@ render_appup(App, File, Up, Down) ->
         {error, enoent} when IsCheck ->
             %% failed to read old file, exit
             logerr("~s is missing", [File]),
-            set_invalid()
+            set_invalid();
+        {error, enoent} ->
+            logerr("~s is missing", [File]),
+            exit(1)
     end.
 
 do_render_appup(File, Up, Down) ->
diff --git a/test/emqx_SUITE.erl b/test/emqx_SUITE.erl
index add7cec3d..8b39886f8 100644
--- a/test/emqx_SUITE.erl
+++ b/test/emqx_SUITE.erl
@@ -60,6 +60,7 @@ t_get_env(_) ->
     application:unset_env(emqx, undefined_key).
 
 t_emqx_pubsub_api(_) ->
+    process_flag(trap_exit, true),
     true = emqx:is_running(node()),
     {ok, C} = emqtt:start_link([{host, "localhost"}, {clientid, "myclient"}]),
     {ok, _} = emqtt:connect(C),
diff --git a/test/emqx_node_helpers.erl b/test/emqx_node_helpers.erl
index 0c0250885..6aa6f6f13 100644
--- a/test/emqx_node_helpers.erl
+++ b/test/emqx_node_helpers.erl
@@ -24,6 +24,7 @@
 -export([start_slave/1,
          start_slave/2,
          stop_slave/1,
+         make_node_name/1,
          wait_for_synced_routes/3
         ]).
 
@@ -75,6 +76,7 @@ stop_slave(Node0) ->
     erase_slave_mod(Node),
     case rpc:call(Node, ekka, leave, []) of
         ok -> ok;
+        {error, node_not_in_cluster} -> ok;
         {badrpc, nodedown} -> ok
     end,
     case SlaveMod:stop(Node) of
@@ -116,11 +118,15 @@ setup_node(Node, #{} = Opts) ->
                   end, LoadApps),
     ok = rpc:call(Node, emqx_ct_helpers, start_apps, [StartApps, EnvHandler]),
 
-    case maps:get(no_join, Opts, false) of
-        true ->
+    case maps:get(join_to, Opts, node()) of
+        undefined ->
             ok;
-        false ->
-            ok = rpc:call(Node, ekka, join, [node()])
+        JoinTo ->
+            %% assert
+            case rpc:call(Node, ekka, join, [JoinTo]) of
+                ok -> ok;
+                ignore -> ok
+            end
     end,
 
     %% Sanity check. Assert that `gen_rpc' is set up correctly: