diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-04-14 17:19:22 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-04-20 15:13:44 +0200 |
| commit | e73791a140e97fb7356c5fb893b865937a37e2c6 (patch) | |
| tree | 4c70930bab6aa50f3475ee41fe3d9d90f8cd45d2 | |
| parent | 5db58873d6733d0189444fa863dd7d63434e27c4 (diff) | |
| download | rabbitmq-server-git-e73791a140e97fb7356c5fb893b865937a37e2c6.tar.gz | |
*_SUITE: Use the new API for inet_tcp_proxy_dist
See rabbitmq/inet_tcp_proxy#3 and rabbitmq/rabbitmq-ct-helpers#39.
| -rw-r--r-- | test/feature_flags_SUITE.erl | 11 | ||||
| -rw-r--r-- | test/per_vhost_connection_limit_partitions_SUITE.erl | 12 | ||||
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 6 |
3 files changed, 10 insertions, 19 deletions
diff --git a/test/feature_flags_SUITE.erl b/test/feature_flags_SUITE.erl index 7cfda838ed..9d6df4a3eb 100644 --- a/test/feature_flags_SUITE.erl +++ b/test/feature_flags_SUITE.erl @@ -105,8 +105,8 @@ groups() -> init_per_suite(Config) -> rabbit_ct_helpers:log_environment(), rabbit_ct_helpers:run_setup_steps(Config, [ - fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1 - ]). + fun rabbit_ct_broker_helpers:configure_dist_proxy/1 + ]). end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). @@ -118,8 +118,7 @@ init_per_group(enabling_on_single_node, Config) -> init_per_group(enabling_in_cluster, Config) -> rabbit_ct_helpers:set_config( Config, - [{rmq_nodes_count, 5}, - {rmq_nodes_clustered, false}]); + [{rmq_nodes_count, 5}]); init_per_group(clustering, Config) -> Config1 = rabbit_ct_helpers:set_config( Config, @@ -225,9 +224,7 @@ init_per_testcase(Testcase, Config) -> Config3 = rabbit_ct_helpers:run_steps( Config2, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps() ++ - [fun rabbit_ct_broker_helpers:enable_dist_proxy/1, - fun rabbit_ct_broker_helpers:cluster_nodes/1]), + rabbit_ct_client_helpers:setup_steps()), case Config3 of {skip, _} -> Config3; diff --git a/test/per_vhost_connection_limit_partitions_SUITE.erl b/test/per_vhost_connection_limit_partitions_SUITE.erl index bd0eb08302..7ec4cc92e4 100644 --- a/test/per_vhost_connection_limit_partitions_SUITE.erl +++ b/test/per_vhost_connection_limit_partitions_SUITE.erl @@ -54,8 +54,8 @@ suite() -> init_per_suite(Config) -> rabbit_ct_helpers:log_environment(), rabbit_ct_helpers:run_setup_steps(Config, [ - fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1 - ]). + fun rabbit_ct_broker_helpers:configure_dist_proxy/1 + ]). end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). @@ -68,15 +68,11 @@ init_per_multinode_group(_Group, Config, NodeCount) -> Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"), Config1 = rabbit_ct_helpers:set_config(Config, [ {rmq_nodes_count, NodeCount}, - {rmq_nodename_suffix, Suffix}, - {rmq_nodes_clustered, false} + {rmq_nodename_suffix, Suffix} ]), rabbit_ct_helpers:run_steps(Config1, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps() ++ [ - fun rabbit_ct_broker_helpers:enable_dist_proxy/1, - fun rabbit_ct_broker_helpers:cluster_nodes/1 - ]). + rabbit_ct_client_helpers:setup_steps()). end_per_group(_Group, Config) -> rabbit_ct_helpers:run_steps(Config, diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index 3a246445e5..4a4738d9fa 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -155,7 +155,7 @@ init_per_suite(Config0) -> Config0, {rabbit, [{quorum_tick_interval, 1000}]}), rabbit_ct_helpers:run_setup_steps( Config, - [fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1]). + [fun rabbit_ct_broker_helpers:configure_dist_proxy/1]). end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). @@ -233,9 +233,7 @@ init_per_testcase(Testcase, Config) when Testcase == reconnect_consumer_and_publ Ret = rabbit_ct_helpers:run_steps( Config2, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps() ++ - [fun rabbit_ct_broker_helpers:enable_dist_proxy/1, - fun rabbit_ct_broker_helpers:cluster_nodes/1]), + rabbit_ct_client_helpers:setup_steps()), case Ret of {skip, _} -> Ret; |