summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-02-02 15:13:32 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-02-02 15:13:32 +0300
commit8f90d8facf0d887b24d283d287aa6811adfa4b35 (patch)
tree5635b0bad97902ff3fd00f2a5240eec656b4039f
parent7708878c885c0151fd5a33099b0678e036d30acb (diff)
downloadrabbitmq-server-git-8f90d8facf0d887b24d283d287aa6811adfa4b35.tar.gz
Skip persistent cluster ID test for mixed version clusters
As previous 3.7.x do not have the function the test relies on. Note that the change is otherwise safe for them.
-rw-r--r--test/clustering_management_SUITE.erl28
1 files changed, 17 insertions, 11 deletions
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl
index 43029153b0..2d7685b860 100644
--- a/test/clustering_management_SUITE.erl
+++ b/test/clustering_management_SUITE.erl
@@ -138,17 +138,23 @@ start_with_invalid_schema_in_path(Config) ->
end.
persistent_cluster_id(Config) ->
- [Rabbit, Hare] = cluster_members(Config),
- ClusterIDA1 = rpc:call(Rabbit, rabbit_nodes, persistent_cluster_id, []),
- ClusterIDB1 = rpc:call(Hare, rabbit_nodes, persistent_cluster_id, []),
- ?assertEqual(ClusterIDA1, ClusterIDB1),
-
- rabbit_ct_broker_helpers:restart_node(Config, Rabbit),
- ClusterIDA2 = rpc:call(Rabbit, rabbit_nodes, persistent_cluster_id, []),
- rabbit_ct_broker_helpers:restart_node(Config, Hare),
- ClusterIDB2 = rpc:call(Hare, rabbit_nodes, persistent_cluster_id, []),
- ?assertEqual(ClusterIDA1, ClusterIDA2),
- ?assertEqual(ClusterIDA2, ClusterIDB2).
+ case os:getenv("SECONDARY_UMBRELLA") of
+ false ->
+ [Rabbit, Hare] = cluster_members(Config),
+ ClusterIDA1 = rpc:call(Rabbit, rabbit_nodes, persistent_cluster_id, []),
+ ClusterIDB1 = rpc:call(Hare, rabbit_nodes, persistent_cluster_id, []),
+ ?assertEqual(ClusterIDA1, ClusterIDB1),
+
+ rabbit_ct_broker_helpers:restart_node(Config, Rabbit),
+ ClusterIDA2 = rpc:call(Rabbit, rabbit_nodes, persistent_cluster_id, []),
+ rabbit_ct_broker_helpers:restart_node(Config, Hare),
+ ClusterIDB2 = rpc:call(Hare, rabbit_nodes, persistent_cluster_id, []),
+ ?assertEqual(ClusterIDA1, ClusterIDA2),
+ ?assertEqual(ClusterIDA2, ClusterIDB2);
+ _ ->
+ %% skip the test in mixed version mode
+ {skip, "Should not run in mixed version environments"}
+ end.
create_bad_schema(Rabbit, Hare, Config) ->