From 8af107e28dcedeacecc4ce1fdb9875a886a159f3 Mon Sep 17 00:00:00 2001
From: Andrew Mayorov <encube.ul@gmail.com>
Date: Sun, 17 Sep 2023 17:13:26 +0400
Subject: [PATCH] test(ds): simplify cluster test setups

---
 apps/emqx/integration_test/emqx_ds_SUITE.erl  | 29 ++++++-------------
 .../test/emqx_persistent_messages_SUITE.erl   | 14 ++-------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/apps/emqx/integration_test/emqx_ds_SUITE.erl b/apps/emqx/integration_test/emqx_ds_SUITE.erl
index fa30661e2..1387b291c 100644
--- a/apps/emqx/integration_test/emqx_ds_SUITE.erl
+++ b/apps/emqx/integration_test/emqx_ds_SUITE.erl
@@ -72,30 +72,19 @@ end_per_testcase(_TestCase, _Config) ->
 %%------------------------------------------------------------------------------
 
 cluster(#{n := N}) ->
-    Node1 = ds_SUITE1,
-    Spec = #{
-        role => core,
-        join_to => emqx_cth_cluster:node_name(Node1),
-        apps => app_specs()
-    },
-    [
-        {Node1, Spec}
-        | lists:map(
-            fun(M) ->
-                Name = binary_to_atom(<<"ds_SUITE", (integer_to_binary(M))/binary>>),
-                {Name, Spec}
-            end,
-            lists:seq(2, N)
-        )
-    ].
+    Spec = #{role => core, apps => app_specs()},
+    lists:map(
+        fun(M) ->
+            Name = list_to_atom("ds_SUITE" ++ integer_to_list(M)),
+            {Name, Spec}
+        end,
+        lists:seq(1, N)
+    ).
 
 app_specs() ->
     [
         emqx_durable_storage,
-        {emqx, #{
-            config => #{persistent_session_store => #{ds => true}},
-            override_env => [{boot_modules, [broker, listeners]}]
-        }}
+        {emqx, "persistent_session_store = {ds = true}"}
     ].
 
 get_mqtt_port(Node, Type) ->
diff --git a/apps/emqx/test/emqx_persistent_messages_SUITE.erl b/apps/emqx/test/emqx_persistent_messages_SUITE.erl
index c7299b3ba..8a6c7c2af 100644
--- a/apps/emqx/test/emqx_persistent_messages_SUITE.erl
+++ b/apps/emqx/test/emqx_persistent_messages_SUITE.erl
@@ -315,21 +315,13 @@ get_iterator_ids(Node, ClientId) ->
 app_specs() ->
     [
         emqx_durable_storage,
-        {emqx, #{
-            config => #{persistent_session_store => #{ds => true}},
-            override_env => [{boot_modules, [broker, listeners]}]
-        }}
+        {emqx, "persistent_session_store {ds = true}"}
     ].
 
 cluster() ->
-    Node1 = persistent_messages_SUITE1,
-    Spec = #{
-        role => core,
-        join_to => emqx_cth_cluster:node_name(Node1),
-        apps => app_specs()
-    },
+    Spec = #{role => core, apps => app_specs()},
     [
-        {Node1, Spec},
+        {persistent_messages_SUITE1, Spec},
         {persistent_messages_SUITE2, Spec}
     ].