Clean up test code

Author: ansd

deps/rabbit/test/amqp_client_SUITE.erl

@@ -250,108 +250,6 @@ end_per_group(_, Config) ->
       rabbit_ct_client_helpers:teardown_steps() ++
       rabbit_ct_broker_helpers:teardown_steps()).
 
-init_per_testcase(T, Config)
-  when T =:= message_headers_conversion orelse
-       T =:= roundtrip_with_drain_quorum_queue orelse
-       T =:= drain_many_quorum_queue orelse
-       T =:= timed_get_quorum_queue orelse
-       T =:= available_messages_quorum_queue ->
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        _ ->
-            {skip, "Receiving with drain from quorum queues in credit API v1 have a known "
-             "bug that they reply with send_drained before delivering the message."}
-    end;
-init_per_testcase(single_active_consumer_drain_quorum_queue = T, Config) ->
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        _ ->
-            {skip, "Draining a SAC inactive quorum queue consumer with credit API v1 "
-             "is known to be unsupported."}
-    end;
-init_per_testcase(T, Config)
-  when T =:= incoming_window_closed_close_link orelse
-       T =:= incoming_window_closed_rabbitmq_internal_flow_classic_queue orelse
-       T =:= incoming_window_closed_rabbitmq_internal_flow_quorum_queue orelse
-       T =:= tcp_back_pressure_rabbitmq_internal_flow_classic_queue orelse
-       T =:= tcp_back_pressure_rabbitmq_internal_flow_quorum_queue ->
-    %% The new RabbitMQ internal flow control
-    %% writer proc <- session proc <- queue proc
-    %% is only available with credit API v2.
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        _ ->
-            {skip, "Feature flag rabbitmq_4.0.0 is disabled"}
-    end;
-init_per_testcase(T, Config)
-  when T =:= modified_quorum_queue orelse
-       T =:= modified_dead_letter_headers_exchange orelse
-       T =:= modified_dead_letter_history ->
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        _ ->
-            {skip, "Feature flag rabbitmq_4.0.0 is disabled, but needed for "
-             "the new #modify{} command being sent to quorum queues."}
-    end;
-init_per_testcase(T, Config)
-  when T =:= detach_requeues_one_session_classic_queue orelse
-       T =:= detach_requeues_drop_head_classic_queue orelse
-       T =:= detach_requeues_two_connections_classic_queue orelse
-       T =:= single_active_consumer_classic_queue ->
-    %% Cancel API v2 reuses feature flag rabbitmq_4.0.0.
-    %% In 3.13, with cancel API v1, when a receiver detaches with unacked messages, these messages
-    %% will remain unacked and unacked message state will be left behind in the server session
-    %% process state.
-    %% In contrast, cancel API v2 in 4.x will requeue any unacked messages if the receiver detaches.
-    %% We skip the single active consumer tests because these test cases assume that detaching a
-    %% receiver link will requeue unacked messages.
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        _ ->
-            {skip, "Cancel API v2 is disabled due to feature flag rabbitmq_4.0.0 being disabled."}
-    end;
-init_per_testcase(T, Config)
-  when T =:= detach_requeues_one_session_quorum_queue orelse
-       T =:= single_active_consumer_quorum_queue orelse
-       T =:= detach_requeues_two_connections_quorum_queue ->
-    %% Feature flag rabbitmq_4.0.0 enables the consumer removal API.
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        Skip ->
-            Skip
-    end;
-init_per_testcase(T, Config)
-  when T =:= leader_transfer_quorum_queue_credit_single orelse
-       T =:= leader_transfer_quorum_queue_credit_batches orelse
-       T =:= async_notify_unsettled_classic_queue orelse
-       T =:= leader_transfer_stream_credit_single orelse
-       T =:= dead_letter_into_stream orelse
-       T =:= classic_queue_on_new_node orelse
-       T =:= leader_transfer_quorum_queue_send orelse
-       T =:= last_queue_confirms orelse
-       T =:= leader_transfer_stream_credit_batches orelse
-       T =:= leader_transfer_stream_send ->
-    %% These test cases flake with feature flag 'rabbitmq_4.0.0' disabled.
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        Skip ->
-            Skip
-    end;
-init_per_testcase(T = immutable_bare_message, Config) ->
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        _ ->
-            {skip, "RabbitMQ is known to wrongfully modify the bare message with feature "
-             "flag rabbitmq_4.0.0 disabled"}
-    end;
 init_per_testcase(T = dead_letter_reject, Config) ->
     case rabbit_ct_broker_helpers:enable_feature_flag(Config, message_containers_deaths_v2) of
         ok ->
@@ -3676,10 +3574,6 @@ async_notify_settled_stream(Config) ->
     async_notify(settled, <<"stream">>, Config).
 
 async_notify_unsettled_classic_queue(Config) ->
-    %% This test flakes with feature flag 'rabbitmq_4.0.0' disabled.
-    %% Link flow control in classic queues with credit API v1 is known to be broken:
-    %% https://github.com/rabbitmq/rabbitmq-server/issues/2597
-    ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0'),
     async_notify(unsettled, <<"classic">>, Config).
 
 async_notify_unsettled_quorum_queue(Config) ->
@@ -3905,25 +3799,18 @@ queue_and_client_different_nodes(QueueLeaderNode, ClientNode, QueueType, Config)
            true,
            accepted),
 
-    case rpc(Config, rabbit_feature_flags, is_enabled, ['rabbitmq_4.0.0']) of
-        true ->
-            %% Send another message and drain.
-            Tag = <<"tag">>,
-            Body = <<"body">>,
-            ok = amqp10_client:send_msg(Sender, amqp10_msg:new(Tag, Body, false)),
-            ok = wait_for_accepted(Tag),
-            ok = amqp10_client:flow_link_credit(Receiver, 999, never, true),
-            [Msg] = receive_messages(Receiver, 1),
-            ?assertEqual([Body], amqp10_msg:body(Msg)),
-            receive {amqp10_event, {link, Receiver, credit_exhausted}} -> ok
-            after 30000 -> ct:fail("expected credit_exhausted")
-            end,
-            ok = amqp10_client:accept_msg(Receiver, Msg);
-        false ->
-            ct:pal("Both quorum queues and classic queues in credit API v1
-                   have a known bug that they reply with send_drained
-                   before delivering the message.")
+    %% Send another message and drain.
+    Tag = <<"tag">>,
+    Body = <<"body">>,
+    ok = amqp10_client:send_msg(Sender, amqp10_msg:new(Tag, Body, false)),
+    ok = wait_for_accepted(Tag),
+    ok = amqp10_client:flow_link_credit(Receiver, 999, never, true),
+    [Msg] = receive_messages(Receiver, 1),
+    ?assertEqual([Body], amqp10_msg:body(Msg)),
+    receive {amqp10_event, {link, Receiver, credit_exhausted}} -> ok
+    after 30000 -> ct:fail("expected credit_exhausted")
     end,
+    ok = amqp10_client:accept_msg(Receiver, Msg),
 
     ExpectedReadyMsgs = 0,
     ?assertEqual(#'queue.delete_ok'{message_count = ExpectedReadyMsgs},

deps/rabbit/test/amqp_dotnet_SUITE.erl

@@ -65,13 +65,11 @@ end_per_suite(Config) ->
 init_per_group(cluster_size_1, Config) ->
     Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"),
     Config1 = rabbit_ct_helpers:set_config(Config, {rmq_nodename_suffix, Suffix}),
-    Config2 = rabbit_ct_helpers:run_setup_steps(
-                Config1,
-                [fun build_dotnet_test_project/1] ++
-                rabbit_ct_broker_helpers:setup_steps() ++
-                rabbit_ct_client_helpers:setup_steps()),
-    ok = rabbit_ct_broker_helpers:enable_feature_flag(Config2, 'rabbitmq_4.0.0'),
-    Config2.
+    rabbit_ct_helpers:run_setup_steps(
+      Config1,
+      [fun build_dotnet_test_project/1] ++
+      rabbit_ct_broker_helpers:setup_steps() ++
+      rabbit_ct_client_helpers:setup_steps()).
 
 end_per_group(_, Config) ->
     rabbit_ct_helpers:run_teardown_steps(

deps/rabbit/test/amqp_jms_SUITE.erl

@@ -77,13 +77,11 @@ init_per_group(cluster_size_1, Config) ->
                    #{amqp_address_v1 => false}
                   }]
                 }),
-    Config3 = rabbit_ct_helpers:run_setup_steps(
-                Config2,
-                [fun build_maven_test_project/1] ++
-                rabbit_ct_broker_helpers:setup_steps() ++
-                rabbit_ct_client_helpers:setup_steps()),
-    ok = rabbit_ct_broker_helpers:enable_feature_flag(Config3, 'rabbitmq_4.0.0'),
-    Config3.
+    rabbit_ct_helpers:run_setup_steps(
+      Config2,
+      [fun build_maven_test_project/1] ++
+      rabbit_ct_broker_helpers:setup_steps() ++
+      rabbit_ct_client_helpers:setup_steps()).
 
 end_per_group(_Group, Config) ->
     rabbit_ct_helpers:run_teardown_steps(

deps/rabbit/test/classic_queue_SUITE.erl

@@ -72,12 +72,7 @@ end_per_group(_, Config) ->
                                 rabbit_ct_broker_helpers:teardown_steps()).
 
 init_per_testcase(T, Config) ->
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            rabbit_ct_helpers:testcase_started(Config, T);
-        Skip ->
-            Skip
-    end.
+    rabbit_ct_helpers:testcase_started(Config, T).
 
 %% -------------------------------------------------------------------
 %% Testcases.

deps/rabbit/test/dead_lettering_SUITE.erl

@@ -184,14 +184,6 @@ init_per_testcase(T, Config)
     %% * stream is known to fail due to https://github.com/rabbitmq/rabbitmq-server/issues/11173
     ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, message_containers_deaths_v2),
     init_per_testcase0(T, Config);
-init_per_testcase(T, Config)
-  when T =:= dead_letter_headers_should_not_be_appended_for_republish ->
-    case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
-        ok ->
-            init_per_testcase0(T, Config);
-        _ ->
-            {skip, "The expectations of this test don't match 3.13 behaviour"}
-    end;
 init_per_testcase(Testcase, Config) ->
     init_per_testcase0(Testcase, Config).
 

deps/rabbit/test/feature_flags_SUITE.erl

@@ -1287,15 +1287,6 @@ activating_plugin_with_new_ff_enabled(Config) ->
     ok.
 
 enable_plugin_feature_flag_after_deactivating_plugin(Config) ->
-    RabbitMQ40Enabled = rabbit_ct_broker_helpers:is_feature_flag_enabled(
-                          Config, 'rabbitmq_4.0.0'),
-    case RabbitMQ40Enabled of
-        true ->
-            ok;
-        false ->
-            throw({skip, "This test triggers a bug present in 3.13"})
-    end,
-
     FFSubsysOk = is_feature_flag_subsystem_available(Config),
 
     log_feature_flags_of_all_nodes(Config),
@@ -1326,15 +1317,6 @@ enable_plugin_feature_flag_after_deactivating_plugin(Config) ->
     ok.
 
 restart_node_with_unknown_enabled_feature_flag(Config) ->
-    RabbitMQ40Enabled = rabbit_ct_broker_helpers:is_feature_flag_enabled(
-                          Config, 'rabbitmq_4.0.0'),
-    case RabbitMQ40Enabled of
-        true ->
-            ok;
-        false ->
-            throw({skip, "This test triggers a bug present in 3.13"})
-    end,
-
     FFSubsysOk = is_feature_flag_subsystem_available(Config),
 
     log_feature_flags_of_all_nodes(Config),