diff options
| author | kjnilsson <knilsson@pivotal.io> | 2020-09-18 10:47:25 +0100 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2020-09-18 10:47:25 +0100 |
| commit | 9b1dd6c0dde783570a70bf63f52200a5aa8ca53a (patch) | |
| tree | ea815d04534575299390f2abfcd711723279cd6a | |
| parent | c0f7940f77fe9dd8027f57dde9ad5ee582cc4fdd (diff) | |
| download | rabbitmq-server-git-9b1dd6c0dde783570a70bf63f52200a5aa8ca53a.tar.gz | |
Ignore some tests when for mixed versions
As they are not able to run.
| -rw-r--r-- | test/per_user_connection_channel_limit_SUITE.erl | 9 | ||||
| -rw-r--r-- | test/per_user_connection_channel_limit_partitions_SUITE.erl | 16 | ||||
| -rw-r--r-- | test/per_user_connection_channel_tracking_SUITE.erl | 9 |
3 files changed, 24 insertions, 10 deletions
diff --git a/test/per_user_connection_channel_limit_SUITE.erl b/test/per_user_connection_channel_limit_SUITE.erl index 4888a65efa..2a64a67505 100644 --- a/test/per_user_connection_channel_limit_SUITE.erl +++ b/test/per_user_connection_channel_limit_SUITE.erl @@ -65,8 +65,13 @@ suite() -> %% ------------------------------------------------------------------- init_per_suite(Config) -> - rabbit_ct_helpers:log_environment(), - rabbit_ct_helpers:run_setup_steps(Config). + case quorum_queue_utils:is_mixed_versions() of + true -> + {skip, "Not mixed versions compatible"}; + false -> + rabbit_ct_helpers:log_environment(), + rabbit_ct_helpers:run_setup_steps(Config) + end. end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). diff --git a/test/per_user_connection_channel_limit_partitions_SUITE.erl b/test/per_user_connection_channel_limit_partitions_SUITE.erl index 32af9ce9a1..4fa8210c60 100644 --- a/test/per_user_connection_channel_limit_partitions_SUITE.erl +++ b/test/per_user_connection_channel_limit_partitions_SUITE.erl @@ -13,8 +13,8 @@ -compile(export_all). --import(rabbit_ct_client_helpers, [open_unmanaged_connection/2, - open_unmanaged_connection/3]). +-import(rabbit_ct_client_helpers, [open_unmanaged_connection/2 + ]). all() -> [ @@ -42,10 +42,14 @@ suite() -> %% ------------------------------------------------------------------- init_per_suite(Config) -> - rabbit_ct_helpers:log_environment(), - rabbit_ct_helpers:run_setup_steps(Config, [ - fun rabbit_ct_broker_helpers:configure_dist_proxy/1 - ]). + case quorum_queue_utils:is_mixed_versions() of + true -> + {skip, "Not mixed versions compatible"}; + false -> + rabbit_ct_helpers:log_environment(), + rabbit_ct_helpers:run_setup_steps( + Config, [fun rabbit_ct_broker_helpers:configure_dist_proxy/1]) + end. end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). diff --git a/test/per_user_connection_channel_tracking_SUITE.erl b/test/per_user_connection_channel_tracking_SUITE.erl index 674a2e4177..912f74ee4a 100644 --- a/test/per_user_connection_channel_tracking_SUITE.erl +++ b/test/per_user_connection_channel_tracking_SUITE.erl @@ -52,8 +52,13 @@ suite() -> %% ------------------------------------------------------------------- init_per_suite(Config) -> - rabbit_ct_helpers:log_environment(), - rabbit_ct_helpers:run_setup_steps(Config). + case quorum_queue_utils:is_mixed_versions() of + true -> + {skip, "Not mixed versions compatible"}; + false -> + rabbit_ct_helpers:log_environment(), + rabbit_ct_helpers:run_setup_steps(Config) + end. end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). |