Remove test code which depended on the virtual_host_metadata featur…

…e flags These checks are now irrelevant as the feature flag is required.
rabbitmq · Aug 1, 2022 · 776b432 · 776b432
1 parent 29b80bd
commit 776b432
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 70 deletions.
diff --git a/deps/rabbit/test/cluster_SUITE.erl b/deps/rabbit/test/cluster_SUITE.erl
@@ -313,34 +313,24 @@ queue_name(Name) ->
     rabbit_misc:r(<<"/">>, queue, Name).
 
 credentials_obfuscation(Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-        false ->
-          case rabbit_ct_broker_helpers:enable_feature_flag(Config, virtual_host_metadata) of
-              ok ->
-                    Value = <<"amqp://something">>,
-                    Obfuscated0 = obfuscate_secret(Config, 0, Value),
-                    Obfuscated1 = obfuscate_secret(Config, 1, Value),
-
-                    ok = rabbit_ct_broker_helpers:restart_broker(Config, 1),
-
-                    ?assertEqual(Value, deobfuscate_secret(Config, 0, Obfuscated0)),
-                    ?assertEqual(Value, deobfuscate_secret(Config, 1, Obfuscated1)),
-                    ?assertEqual(Value, deobfuscate_secret(Config, 0, Obfuscated1)),
-                    ?assertEqual(Value, deobfuscate_secret(Config, 1, Obfuscated1)),
-
-                    Obfuscated2 = obfuscate_secret(Config, 1, Value),
-
-                    ok = rabbit_ct_broker_helpers:restart_broker(Config, 0),
-
-                    ?assertEqual(Value, deobfuscate_secret(Config, 0, Obfuscated2)),
-                    ok;
-              Skip ->
-                  Skip
-          end;
-        _ ->
-          %% skip the test in mixed version mode
-          {skip, "Should not run in mixed version environments"}
-      end.
+    Value = <<"amqp://something">>,
+    Obfuscated0 = obfuscate_secret(Config, 0, Value),
+    Obfuscated1 = obfuscate_secret(Config, 1, Value),
+
+    ok = rabbit_ct_broker_helpers:restart_broker(Config, 1),
+
+    ?assertEqual(Value, deobfuscate_secret(Config, 0, Obfuscated0)),
+    ?assertEqual(Value, deobfuscate_secret(Config, 1, Obfuscated1)),
+    ?assertEqual(Value, deobfuscate_secret(Config, 0, Obfuscated1)),
+    ?assertEqual(Value, deobfuscate_secret(Config, 1, Obfuscated1)),
+
+    Obfuscated2 = obfuscate_secret(Config, 1, Value),
+
+    ok = rabbit_ct_broker_helpers:restart_broker(Config, 0),
+
+    ?assertEqual(Value, deobfuscate_secret(Config, 0, Obfuscated2)),
+    ok.
+
 obfuscate_secret(Config, Node, Value) -> 
     {encrypted, _} = Result = rabbit_ct_broker_helpers:rpc(Config, Node, 
         credentials_obfuscation, encrypt, [Value]),

diff --git a/deps/rabbit/test/definition_import_SUITE.erl b/deps/rabbit/test/definition_import_SUITE.erl
@@ -261,32 +261,21 @@ import_case14(Config) -> import_file_case(Config, "case14").
 import_case15(Config) -> import_file_case(Config, "case15").
 %% contains a virtual host with tags
 import_case16(Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-      false ->
-        case rabbit_ct_broker_helpers:enable_feature_flag(Config, virtual_host_metadata) of
-            ok ->
-                import_file_case(Config, "case16"),
-                VHost = <<"tagged">>,
-                VHostIsImported =
-                fun () ->
-                        case vhost_lookup(Config, VHost) of
-                            {error, {no_such_vhosts, _}} -> false;
-                            _       -> true
-                        end
-                end,
-                rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
-                VHostRec = vhost_lookup(Config, VHost),
-                ?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
-                ?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
-
-                ok;
-            Skip ->
-                Skip
-        end;
-      _ ->
-        %% skip the test in mixed version mode
-        {skip, "Should not run in mixed version environments"}
-    end.
+    import_file_case(Config, "case16"),
+    VHost = <<"tagged">>,
+    VHostIsImported =
+    fun () ->
+            case vhost_lookup(Config, VHost) of
+                {error, {no_such_vhosts, _}} -> false;
+                _       -> true
+            end
+    end,
+    rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
+    VHostRec = vhost_lookup(Config, VHost),
+    ?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
+    ?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
+
+    ok.
 
 import_case17(Config) -> import_invalid_file_case(Config, "failing_case17").
 

diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl
@@ -222,8 +222,6 @@ init_per_group(Group, Config) ->
                             %% more time after clustering before running the
                             %% tests.
                             timer:sleep(ClusterSize * 1000),
-                            ok = rabbit_ct_broker_helpers:enable_feature_flag(
-                                   Config2, virtual_host_metadata),
                             Config2;
                         Skip ->
                             end_per_group(Group, Config2),

diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
@@ -462,21 +462,13 @@ vhosts_test(Config) ->
     passed.
 
 vhosts_description_test(Config) ->
-    Ret = rabbit_ct_broker_helpers:enable_feature_flag(
-            Config, virtual_host_metadata),
-
     http_put(Config, "/vhosts/myvhost", [{description, <<"vhost description">>},
                                          {tags, <<"tag1,tag2">>}], {group, '2xx'}),
-    Expected = case Ret of
-                   {skip, _} ->
-                       #{name => <<"myvhost">>};
-                   _ ->
-                       #{name => <<"myvhost">>,
-                         metadata => #{
-                           description => <<"vhost description">>,
-                           tags => [<<"tag1">>, <<"tag2">>]
-                          }}
-               end,
+    Expected = #{name => <<"myvhost">>,
+                 metadata => #{
+                               description => <<"vhost description">>,
+                               tags => [<<"tag1">>, <<"tag2">>]
+                              }},
     assert_item(Expected, http_get(Config, "/vhosts/myvhost")),
 
     %% Delete it

diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
@@ -82,7 +82,6 @@ init_per_group(Group, Config)
                                                     {rabbit,
                                                      [{forced_feature_flags_on_init,
                                                        [classic_mirrored_queue_version,
-                                                        virtual_host_metadata,
                                                         quorum_queue,
                                                         stream_queue]}]})
                  end];