root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Jean-Sébastien Pédron 2016-12-02 18:23:24 +01:00
parent 68fdb120e0 87995fe675
commit 7c848ca98a
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/metrics_SUITE.erl
View File

@ -88,26 +88,26 @@ end_per_testcase(Testcase, Config) ->
% NB: node_stats tests are in the management_agent repo % NB: node_stats tests are in the management_agent repo
connection_metric_count_test(Config) -> connection_metric_count_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_connection_metric_count/1, [Config], 25). rabbit_ct_proper_helpers:run_proper(fun prop_connection_metric_count/1, [Config], 25).
channel_metric_count_test(Config) -> channel_metric_count_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_channel_metric_count/1, [Config], 25). rabbit_ct_proper_helpers:run_proper(fun prop_channel_metric_count/1, [Config], 25).
queue_metric_count_test(Config) -> queue_metric_count_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_queue_metric_count/1, [Config], 5). rabbit_ct_proper_helpers:run_proper(fun prop_queue_metric_count/1, [Config], 5).
queue_metric_count_channel_per_queue_test(Config) -> queue_metric_count_channel_per_queue_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_queue_metric_count_channel_per_queue/1, rabbit_ct_proper_helpers:run_proper(fun prop_queue_metric_count_channel_per_queue/1,
[Config], 5). [Config], 5).
connection_metric_idemp_test(Config) -> connection_metric_idemp_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_connection_metric_idemp/1, [Config], 25). rabbit_ct_proper_helpers:run_proper(fun prop_connection_metric_idemp/1, [Config], 25).
channel_metric_idemp_test(Config) -> channel_metric_idemp_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_channel_metric_idemp/1, [Config], 25). rabbit_ct_proper_helpers:run_proper(fun prop_channel_metric_idemp/1, [Config], 25).
queue_metric_idemp_test(Config) -> queue_metric_idemp_test(Config) ->
rabbit_proper_helpers:run_proper(fun prop_queue_metric_idemp/1, [Config], 25). rabbit_ct_proper_helpers:run_proper(fun prop_queue_metric_idemp/1, [Config], 25).
prop_connection_metric_idemp(Config) -> prop_connection_metric_idemp(Config) ->
?FORALL(N, {integer(1, 25), integer(1, 25)}, ?FORALL(N, {integer(1, 25), integer(1, 25)},