Skip to content

Tests: wait until stats are published, not just collected on the agent (backport #12501) #12505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Tests: wait until stats are published, not just collected on the agent (backport #12501) #12505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb15c83
Tests: wait until stats are published, not just collected on the agent
dcorbacho Oct 10, 2024
af85d9d
Tests: wait until stats are published, not just collected on the agent
dcorbacho Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion deps/rabbitmq_management/test/clustering_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,9 @@ queue_on_other_node(Config) ->
consume(Chan2, <<"some-queue">>),

force_stats(Config),
Res = http_get(Config, "/queues/%2F/some-queue"),
?awaitMatch([_], maps:get(consumer_details, http_get(Config, "/queues/%2F/some-queue")), 60000),

Res = http_get(Config, "/queues/%2F/some-queue"),
% assert some basic data is present
[Cons] = maps:get(consumer_details, Res),
#{} = maps:get(channel_details, Cons), % channel details proplist must not be empty
Expand Down
15 changes: 14 additions & 1 deletion deps/rabbitmq_management/test/clustering_prop_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ prop_connection_channel_counts(Config) ->
execute_op(Config, Op, Agg)
end, [], Ops),
force_stats(Config),
Res = validate_counts(Config, Cons),
%% TODO retry a few times
Res = retry_for(
fun() -> validate_counts(Config, Cons) end,
60),
cleanup(Cons),
rabbit_ct_helpers:await_condition(
fun () -> validate_counts(Config, []) end,
Expand Down Expand Up @@ -275,3 +278,13 @@ dump_table(Config, Table) ->
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.
Loading