Reuse node per group to make the test faster

Author: SimonUnge

deps/rabbit/test/node_initial_run_SUITE.erl

@@ -46,32 +46,32 @@ end_per_suite(Config) ->
     rabbit_ct_helpers:run_teardown_steps(Config).
 
 init_per_group(Groupname, Config) ->
-    rabbit_ct_helpers:set_config(Config, [
-        {metadata_store, meta_store(Groupname)},
-        {rmq_nodes_clustered, false},
-        {rmq_nodename_suffix, Groupname},
-        {rmq_nodes_count, 1}
-    ]).
-
-end_per_group(_, Config) ->
-    Config.
-
-init_per_testcase(Testcase, Config) ->
-    rabbit_ct_helpers:testcase_started(Config, Testcase),
-    Config0 = maybe_enable_verify_initial_run(Config, Testcase),
+    Config0 = rabbit_ct_helpers:set_config(Config, [
+                                                    {metadata_store, meta_store(Groupname)},
+                                                    {rmq_nodes_clustered, false},
+                                                    {rmq_nodename_suffix, Groupname},
+                                                    {rmq_nodes_count, 1}
+                                                   ]),
     rabbit_ct_helpers:run_steps(
         Config0,
         rabbit_ct_broker_helpers:setup_steps() ++
             rabbit_ct_client_helpers:setup_steps()
     ).
 
-end_per_testcase(Testcase, Config) ->
-    Config1 = rabbit_ct_helpers:run_steps(
+
+end_per_group(_, Config) ->
+    rabbit_ct_helpers:run_steps(
         Config,
         rabbit_ct_client_helpers:teardown_steps() ++
             rabbit_ct_broker_helpers:teardown_steps()
-    ),
-    rabbit_ct_helpers:testcase_finished(Config1, Testcase).
+    ).
+
+init_per_testcase(Testcase, Config) ->
+    rabbit_ct_helpers:testcase_started(Config, Testcase),
+    Config.
+
+end_per_testcase(Testcase, Config) ->
+    rabbit_ct_helpers:testcase_finished(Config, Testcase).
 
 %% -------------------------------------------------------------------
 %% Test cases
@@ -86,6 +86,7 @@ verify_initial_run_disabled(Config) ->
 
     % Restarting the node should work fine
     ok = stop_app(Config),
+    set_env(Config, false),
     ok = start_app(Config),
     % Still no marker file
     ?assertNot(filelib:is_file(MarkerFile)),
@@ -95,11 +96,16 @@ verify_initial_run_enabled(Config) ->
     DataDir = rabbit_ct_broker_helpers:get_node_config(Config, 0, data_dir),
     MarkerFile = filename:join(DataDir, "node_initialized.marker"),
 
+
+    ok = stop_app(Config),
+    set_env(Config, true),
+    ok = start_app(Config),
     % Setting is enabled so marker file should be present after initial startup
     ?assert(filelib:is_file(MarkerFile)),
 
     % Restarting the node should be fine, as there is a marker file
     % and corresponding schema data (consistent state)
+
     ok = stop_app(Config),
     ok = start_app(Config),
 
@@ -158,3 +164,7 @@ schema_file(Config) ->
             NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
             filename:join([DataDir, "coordination", NodeName, "names.dets"])
     end.
+
+set_env(Config, Bool) ->
+    Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
+    ok = rpc:call(Node, application, set_env, [rabbit, verify_initial_run, Bool]).