Merge branch 'stable'

deps/rabbitmq_stomp/src/rabbitmq_stomp.app.src

@@ -5,8 +5,8 @@
   {registered, []},
   {mod, {rabbit_stomp, []}},
   {env, [{default_user,
-          [{login, "guest"},
-           {passcode, "guest"}]},
+          [{login, <<"guest">>},
+           {passcode, <<"guest">>}]},
          {default_vhost, <<"/">>},
          {ssl_cert_login, false},
          {implicit_connect, false},

deps/rabbitmq_stomp/test/amqqueue_SUITE.erl

@@ -54,10 +54,11 @@ init_per_suite(Config) ->
                                            [{rmq_nodename_suffix, ?MODULE}]),
     rabbit_ct_helpers:log_environment(),
     rabbit_ct_helpers:run_setup_steps(Config1,
-                                      rabbit_ct_broker_helpers:setup_steps()).
+      rabbit_ct_broker_helpers:setup_steps()).
 
 end_per_suite(Config) ->
-    rabbit_ct_helpers:run_teardown_steps(Config).
+    rabbit_ct_helpers:run_teardown_steps(Config,
+      rabbit_ct_broker_helpers:teardown_steps()).
 
 init_per_group(Group, Config) ->
     Version = string:sub_string(atom_to_list(Group), 9),

deps/rabbitmq_stomp/test/connections_SUITE.erl

@@ -35,11 +35,12 @@ init_per_suite(Config) ->
                                            [{rmq_nodename_suffix, ?MODULE}]),
     rabbit_ct_helpers:log_environment(),
     rabbit_ct_helpers:run_setup_steps(Config1,
-                                      rabbit_ct_broker_helpers:setup_steps()).
+      rabbit_ct_broker_helpers:setup_steps()).
 
 
 end_per_suite(Config) ->
-    rabbit_ct_helpers:run_teardown_steps(Config).
+    rabbit_ct_helpers:run_teardown_steps(Config,
+      rabbit_ct_broker_helpers:teardown_steps()).
 
 -define(GARBAGE, <<"bdaf63dda9d78b075c748b740e7c3510ad203b07\nbdaf63dd">>).
 

deps/rabbitmq_stomp/test/python_SUITE.erl

@@ -25,7 +25,8 @@ init_per_testcase(_, Config) ->
     Config2.
 
 end_per_testcase(_, Config) ->
-    rabbit_ct_helpers:run_teardown_steps(Config).
+    rabbit_ct_helpers:run_teardown_steps(Config,
+        rabbit_ct_broker_helpers:teardown_steps()).
 
 
 common(Config) ->