summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2020-07-07 15:18:17 +0700
committerGitHub <noreply@github.com>2020-07-07 15:18:17 +0700
commitb8edec02392fba0788db0ccfea5af5017fc64485 (patch)
treec1d1a62d0cf628881becaa757e983d5364f24dca
parentcd2fee1a50fc4d2dd291fb82333f94a5d1c4c0ce (diff)
parent69e5e148ad85ac2e56abb726a11d88a04f485c94 (diff)
downloadrabbitmq-server-git-b8edec02392fba0788db0ccfea5af5017fc64485.tar.gz
Merge pull request #2402 from rabbitmq/metrics-flakiness
Attempt to further de-flake metrics/connection_metric_idemp_test
-rw-r--r--test/metrics_SUITE.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/metrics_SUITE.erl b/test/metrics_SUITE.erl
index 2d0ed5b2d4..d2ceab2faa 100644
--- a/test/metrics_SUITE.erl
+++ b/test/metrics_SUITE.erl
@@ -21,6 +21,7 @@
-include_lib("eunit/include/eunit.hrl").
-include_lib("amqp_client/include/amqp_client.hrl").
-include_lib("rabbit_common/include/rabbit_core_metrics.hrl").
+-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
all() ->
@@ -144,7 +145,10 @@ prop_queue_metric_count_channel_per_queue(Config) ->
connection_metric_idemp(Config, {N, R}) ->
Conns = [rabbit_ct_client_helpers:open_unmanaged_connection(Config)
|| _ <- lists:seq(1, N)],
- Table = [ Pid || {Pid, _} <- read_table_rpc(Config, connection_metrics)],
+ Table = ?awaitMatch(L when is_list(L) andalso length(L) == N,
+ [ Pid || {Pid, _} <- read_table_rpc(Config,
+ connection_metrics)],
+ 5000),
Table2 = [ Pid || {Pid, _} <- read_table_rpc(Config, connection_coarse_metrics)],
% refresh stats 'R' times
[[Pid ! emit_stats || Pid <- Table] || _ <- lists:seq(1, R)],