diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-07-03 02:39:09 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-07-03 02:55:05 +0300 |
| commit | a9f5d3884121ce041965517df25b07c7cd8ce87d (patch) | |
| tree | 31cfe73caaaaa5f6e09843e38820255018dcf7d2 /test | |
| parent | 1abf4b3c5c9de7e448ac11fba83292f274060fa3 (diff) | |
| download | rabbitmq-server-git-a9f5d3884121ce041965517df25b07c7cd8ce87d.tar.gz | |
dist_proxy helpers moved to rabbit_ct_broker_helpers
Diffstat (limited to 'test')
| -rw-r--r-- | test/partitions_SUITE.erl | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/test/partitions_SUITE.erl b/test/partitions_SUITE.erl index b93e1ea9dd..ff8d5f5f13 100644 --- a/test/partitions_SUITE.erl +++ b/test/partitions_SUITE.erl @@ -21,6 +21,10 @@ -compile(export_all). +-import(rabbit_ct_broker_helpers, [enable_dist_proxy_manager/1, + enable_dist_proxy/1, + enable_dist_proxy_on_node/3]). + %% We set ticktime to 1s and setuptime is 7s so to make sure it %% passes... -define(DELAY, 8000). @@ -69,7 +73,7 @@ groups() -> init_per_suite(Config) -> rabbit_ct_helpers:log_environment(), rabbit_ct_helpers:run_setup_steps(Config, [ - fun enable_dist_proxy_manager/1 + fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1 ]). end_per_suite(Config) -> @@ -99,7 +103,7 @@ init_per_testcase(Testcase, Config) -> rabbit_ct_helpers:run_steps(Config1, rabbit_ct_broker_helpers:setup_steps() ++ rabbit_ct_client_helpers:setup_steps() ++ [ - fun enable_dist_proxy/1, + fun rabbit_ct_broker_helpers:enable_dist_proxy/1, fun rabbit_ct_broker_helpers:cluster_nodes/1 ]). @@ -109,31 +113,6 @@ end_per_testcase(Testcase, Config) -> rabbit_ct_broker_helpers:teardown_steps()), rabbit_ct_helpers:testcase_finished(Config1, Testcase). -enable_dist_proxy_manager(Config) -> - inet_tcp_proxy_manager:start(), - rabbit_ct_helpers:set_config(Config, - {erlang_dist_module, inet_proxy_dist}). - -enable_dist_proxy(Config) -> - NodeConfigs = rabbit_ct_broker_helpers:get_node_configs(Config), - Nodes = [?config(nodename, NodeConfig) || NodeConfig <- NodeConfigs], - ManagerNode = node(), - ok = lists:foreach( - fun(NodeConfig) -> - ok = rabbit_ct_broker_helpers:rpc(Config, - ?config(nodename, NodeConfig), - ?MODULE, enable_dist_proxy_on_node, - [NodeConfig, ManagerNode, Nodes]) - end, NodeConfigs), - Config. - -enable_dist_proxy_on_node(NodeConfig, ManagerNode, Nodes) -> - Nodename = ?config(nodename, NodeConfig), - DistPort = ?config(tcp_port_erlang_dist, NodeConfig), - ProxyPort = ?config(tcp_port_erlang_dist_proxy, NodeConfig), - ok = inet_tcp_proxy:start(ManagerNode, DistPort, ProxyPort), - ok = inet_tcp_proxy:reconnect(Nodes -- [Nodename]). - %% ------------------------------------------------------------------- %% Testcases. %% ------------------------------------------------------------------- |