summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorkjnilsson <knilsson@pivotal.io>2017-03-06 11:30:48 +0000
committerkjnilsson <knilsson@pivotal.io>2017-03-06 11:30:48 +0000
commitcc6c3038131d6f5c0912d6270de59c0b5b309c5d (patch)
treeed2d6467f51356786d47bbf18d7136502f7a52ac /test
parent697113decf7c174561e87eee99ce4649ad8701a7 (diff)
downloadrabbitmq-server-git-cc6c3038131d6f5c0912d6270de59c0b5b309c5d.tar.gz
Attempt to make metrics_SUITE more rubust
Diffstat (limited to 'test')
-rw-r--r--test/metrics_SUITE.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/metrics_SUITE.erl b/test/metrics_SUITE.erl
index 14955d127d..a66e9cec3c 100644
--- a/test/metrics_SUITE.erl
+++ b/test/metrics_SUITE.erl
@@ -146,7 +146,7 @@ connection_metric_idemp(Config, {N, R}) ->
Table2 = [ Pid || {Pid, _} <- read_table_rpc(Config, connection_coarse_metrics)],
% referesh stats 'R' times
[[Pid ! emit_stats || Pid <- Table] || _ <- lists:seq(1, R)],
- timer:sleep(100),
+ force_metric_gc(Config),
TableAfter = [ Pid || {Pid, _} <- read_table_rpc(Config, connection_metrics)],
TableAfter2 = [ Pid || {Pid, _} <- read_table_rpc(Config, connection_coarse_metrics)],
[rabbit_ct_client_helpers:close_connection(Conn) || Conn <- Conns],
@@ -160,7 +160,7 @@ channel_metric_idemp(Config, {N, R}) ->
Table2 = [ Pid || {Pid, _} <- read_table_rpc(Config, channel_process_metrics)],
% referesh stats 'R' times
[[Pid ! emit_stats || Pid <- Table] || _ <- lists:seq(1, R)],
- timer:sleep(100),
+ force_metric_gc(Config),
TableAfter = [ Pid || {Pid, _} <- read_table_rpc(Config, channel_metrics)],
TableAfter2 = [ Pid || {Pid, _} <- read_table_rpc(Config, channel_process_metrics)],
rabbit_ct_client_helpers:close_connection(Conn),
@@ -184,7 +184,7 @@ queue_metric_idemp(Config, {N, R}) ->
% referesh stats 'R' times
ChanTable = read_table_rpc(Config, channel_created),
[[Pid ! emit_stats || {Pid, _, _} <- ChanTable ] || _ <- lists:seq(1, R)],
- timer:sleep(100),
+ force_metric_gc(Config),
TableAfter = [ Pid || {Pid, _, _} <- read_table_rpc(Config, queue_metrics)],
TableAfter2 = [ Pid || {Pid, _, _} <- read_table_rpc(Config, queue_coarse_metrics)],
[ delete_queue(Chan, Q) || Q <- Queues],
@@ -398,7 +398,7 @@ read_table(Table) ->
ets:tab2list(Table).
force_metric_gc(Config) ->
- timer:sleep(100),
+ timer:sleep(300),
rabbit_ct_broker_helpers:rpc(Config, 0, erlang, send,
[rabbit_core_metrics_gc, start_gc]),
rabbit_ct_broker_helpers:rpc(Config, 0, gen_server, call,