rabbit tests: Redirect logs to ct always

Doing it on a per test suite basis leads to issues if multiple
suites try to configure it, and there's no cleanup performed
anyway.

Author: lhoguin

deps/rabbit/Makefile

@@ -224,6 +224,8 @@ ct-fast:
 ct-slow:
 	$(MAKE) ct CT_SUITES='$(SLOW_CT_SUITES)'
 
+CT_OPTS += -ct_hooks rabbit_ct_hook []
+
 # --------------------------------------------------------------------
 # Compilation.
 # --------------------------------------------------------------------

deps/rabbit/test/deprecated_features_SUITE.erl

@@ -85,9 +85,7 @@ groups() ->
 init_per_suite(Config) ->
     rabbit_ct_helpers:log_environment(),
     logger:set_primary_config(level, debug),
-    rabbit_ct_helpers:run_setup_steps(
-      Config,
-      [fun rabbit_ct_helpers:redirect_logger_to_ct_logs/1]).
+    rabbit_ct_helpers:run_setup_steps(Config, []).
 
 end_per_suite(Config) ->
     Config.

deps/rabbit/test/feature_flags_SUITE.erl

@@ -122,9 +122,7 @@ end_per_suite(Config) ->
 
 init_per_group(registry, Config) ->
     logger:set_primary_config(level, debug),
-    rabbit_ct_helpers:run_steps(
-      Config,
-      [fun rabbit_ct_helpers:redirect_logger_to_ct_logs/1]);
+    rabbit_ct_helpers:run_steps(Config, []);
 init_per_group(feature_flags_v2, Config) ->
     %% `feature_flags_v2' is now required and won't work in mixed-version
     %% clusters if the other version doesn't support it.

deps/rabbit/test/feature_flags_v2_SUITE.erl

@@ -114,9 +114,7 @@ groups() ->
 init_per_suite(Config) ->
     rabbit_ct_helpers:log_environment(),
     logger:set_primary_config(level, debug),
-    rabbit_ct_helpers:run_steps(
-      Config,
-      [fun rabbit_ct_helpers:redirect_logger_to_ct_logs/1]).
+    rabbit_ct_helpers:run_steps(Config, []).
 
 end_per_suite(Config) ->
     Config.

deps/rabbit/test/rabbit_ct_hook.erl

@@ -0,0 +1,7 @@
+-module(rabbit_ct_hook).
+
+-export([init/2]).
+
+init(_, _) ->
+    _ = rabbit_ct_helpers:redirect_logger_to_ct_logs([]),
+	{ok, undefined}.

deps/rabbit/test/rabbitmq_4_0_deprecations_SUITE.erl

@@ -75,9 +75,7 @@ groups() ->
 init_per_suite(Config) ->
     rabbit_ct_helpers:log_environment(),
     logger:set_primary_config(level, debug),
-    rabbit_ct_helpers:run_setup_steps(
-      Config,
-      [fun rabbit_ct_helpers:redirect_logger_to_ct_logs/1]).
+    rabbit_ct_helpers:run_setup_steps(Config, []).
 
 end_per_suite(Config) ->
     Config.