diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-07-24 11:54:05 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-07-24 11:54:05 +0100 |
| commit | 5705d8b5a5f3697c85dc9aa1de6481303691267a (patch) | |
| tree | ed1b040d203b67e3001817363dd592fdb6f8d64d | |
| parent | 47949a5970603f20d9227484b5839e37101ce642 (diff) | |
| download | rabbitmq-server-git-5705d8b5a5f3697c85dc9aa1de6481303691267a.tar.gz | |
Cleanup test groups
| -rw-r--r-- | test/vhost_SUITE.erl | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/test/vhost_SUITE.erl b/test/vhost_SUITE.erl index a9eb2e1e09..a519d01af5 100644 --- a/test/vhost_SUITE.erl +++ b/test/vhost_SUITE.erl @@ -47,10 +47,7 @@ groups() -> {cluster_size_1_network, [], ClusterSize1Tests}, {cluster_size_2_network, [], ClusterSize2Tests}, {cluster_size_1_direct, [], ClusterSize1Tests}, - {cluster_size_2_direct, [], ClusterSize2Tests}, - {cluster_rename, [], [ - vhost_limit_after_node_renamed - ]} + {cluster_size_2_direct, [], ClusterSize2Tests} ]. suite() -> @@ -86,10 +83,7 @@ init_per_group(cluster_size_1_direct, Config) -> init_per_multinode_group(cluster_size_1_direct, Config1, 1); init_per_group(cluster_size_2_direct, Config) -> Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]), - init_per_multinode_group(cluster_size_2_direct, Config1, 2); - -init_per_group(cluster_rename, Config) -> - init_per_multinode_group(cluster_rename, Config, 2). + init_per_multinode_group(cluster_size_2_direct, Config1, 2). init_per_multinode_group(Group, Config, NodeCount) -> Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"), @@ -97,19 +91,11 @@ init_per_multinode_group(Group, Config, NodeCount) -> {rmq_nodes_count, NodeCount}, {rmq_nodename_suffix, Suffix} ]), - case Group of - cluster_rename -> - % The broker is managed by {init,end}_per_testcase(). - Config1; - _ -> - rabbit_ct_helpers:run_steps(Config1, - rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps()) - end. -end_per_group(cluster_rename, Config) -> - % The broker is managed by {init,end}_per_testcase(). - Config; + rabbit_ct_helpers:run_steps(Config1, + rabbit_ct_broker_helpers:setup_steps() ++ + rabbit_ct_client_helpers:setup_steps()). + end_per_group(_Group, Config) -> rabbit_ct_helpers:run_steps(Config, rabbit_ct_client_helpers:teardown_steps() ++ |