Merge pull request #15616 from rabbitmq/mk-flake-fixes-mar-2-2026

STOMP `python_SUITE`: avoid resetting the node during setup

Author: michaelklishin

deps/rabbitmq_management/test/clustering_prop_SUITE.erl

@@ -110,25 +110,26 @@ prop_connection_channel_counts(Config) ->
             begin
                 % ensure we begin with no connections
                 ct:pal("Init testcase"),
-                true = validate_counts(Config, []),
+                rabbit_ct_helpers:await_condition(
+                  fun () -> validate_counts(Config, []) end,
+                  60000),
                 Cons = lists:foldl(fun (Op, Agg) ->
                                           execute_op(Config, Op, Agg)
                                    end, [], Ops),
-                %% TODO retry a few times
                 ct:pal("Check testcase"),
-                Res = retry_for(
-                        fun() ->
-                                force_stats(Config),
-                                validate_counts(Config, Cons) end,
-                        60),
+                rabbit_ct_helpers:await_condition(
+                  fun () ->
+                          force_stats(Config),
+                          validate_counts(Config, Cons) end,
+                  60000),
                 ct:pal("Cleanup testcase"),
                 rabbit_ct_helpers:await_condition(
                   fun () ->
                           cleanup(Cons),
                           force_stats(Config),
                           validate_counts(Config, []) end,
                   60000),
-                Res
+                true
             end).
 
 validate_counts(Config, Conns) ->
@@ -291,14 +292,3 @@ dump_table(Config, Table) ->
     ct:pal(?LOW_IMPORTANCE, "Node 0: Dump of table ~tp:~n~tp~n", [Table, Data]),
     Data0 = rabbit_ct_broker_helpers:rpc(Config, 1, ets, tab2list, [Table]),
     ct:pal(?LOW_IMPORTANCE, "Node 1: Dump of table ~tp:~n~tp~n", [Table, Data0]).
-
-retry_for(_Fun, 0) ->
-    false;
-retry_for(Fun, Retries) ->
-    case Fun() of
-        true ->
-            true;
-        false ->
-            timer:sleep(1000),
-            retry_for(Fun, Retries - 1)
-    end.

deps/rabbitmq_stomp/test/python_SUITE_data/src/test_util.py

@@ -13,9 +13,6 @@
 
 def ensure_ssl_auth_user():
     user = 'O=client,CN=%s' % socket.gethostname()
-    rabbitmqctl(['stop_app'])
-    rabbitmqctl(['reset'])
-    rabbitmqctl(['start_app'])
     rabbitmqctl(['add_user', user, 'foo'])
     rabbitmqctl(['clear_password', user])
     rabbitmqctl(['set_permissions', user, '.*', '.*', '.*'])