Skip to content

Commit 9b3b332

Browse files
lhoguinlhoguin
committed
Mark transient_nonexcl_queues as denied_by_default
Thanks Diana for most of the shovel fixes, and JSP for assisting in fixing the callback.
1 parent 21a2ba5 commit 9b3b332

58 files changed

Lines changed: 334 additions & 321 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deps/amqp_client/src/amqp_rpc_server.erl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ stop(Pid) ->
7171
init([Connection, Q, Fun]) ->
7272
{ok, Channel} = amqp_connection:open_channel(
7373
Connection, {amqp_direct_consumer, [self()]}),
74-
amqp_channel:call(Channel, #'queue.declare'{queue = Q}),
74+
amqp_channel:call(Channel, #'queue.declare'{queue = Q, durable = true}),
7575
amqp_channel:call(Channel, #'basic.consume'{queue = Q}),
7676
{ok, #state{channel = Channel, handler = Fun} }.
7777

‎deps/amqp_client/test/system_SUITE.erl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ basic_qos_test(Config, Prefetch) ->
492492
Parent = self(),
493493
{ok, Chan} = amqp_connection:open_channel(Connection),
494494
#'queue.declare_ok'{queue = Q} =
495-
amqp_channel:call(Chan, #'queue.declare'{}),
495+
amqp_channel:call(Chan, #'queue.declare'{durable = true}),
496496
Kids = [spawn(
497497
fun() ->
498498
{ok, Channel} = amqp_connection:open_channel(Connection),
@@ -554,7 +554,7 @@ basic_recover(Config) ->
554554
{ok, Channel} = amqp_connection:open_channel(
555555
Connection, {amqp_direct_consumer, [self()]}),
556556
#'queue.declare_ok'{queue = Q} =
557-
amqp_channel:call(Channel, #'queue.declare'{}),
557+
amqp_channel:call(Channel, #'queue.declare'{durable = true}),
558558
#'basic.consume_ok'{consumer_tag = Tag} =
559559
amqp_channel:call(Channel, #'basic.consume'{queue = Q}),
560560
receive #'basic.consume_ok'{consumer_tag = Tag} -> ok end,
@@ -596,7 +596,7 @@ basic_consume(Config) ->
596596

597597
consume_loop(Channel, X, RoutingKey, Parent, Tag) ->
598598
#'queue.declare_ok'{queue = Q} =
599-
amqp_channel:call(Channel, #'queue.declare'{}),
599+
amqp_channel:call(Channel, #'queue.declare'{durable = true}),
600600
#'queue.bind_ok'{} =
601601
amqp_channel:call(Channel, #'queue.bind'{queue = Q,
602602
exchange = X,
@@ -618,7 +618,7 @@ consume_notification(Config) ->
618618
{ok, Connection} = new_connection(Config),
619619
{ok, Channel} = amqp_connection:open_channel(Connection),
620620
#'queue.declare_ok'{queue = Q} =
621-
amqp_channel:call(Channel, #'queue.declare'{}),
621+
amqp_channel:call(Channel, #'queue.declare'{durable = true}),
622622
#'basic.consume_ok'{consumer_tag = CTag} = ConsumeOk =
623623
amqp_channel:call(Channel, #'basic.consume'{queue = Q}),
624624
receive ConsumeOk -> ok end,
@@ -633,7 +633,7 @@ basic_nack(Config) ->
633633
{ok, Connection} = new_connection(Config),
634634
{ok, Channel} = amqp_connection:open_channel(Connection),
635635
#'queue.declare_ok'{queue = Q}
636-
= amqp_channel:call(Channel, #'queue.declare'{}),
636+
= amqp_channel:call(Channel, #'queue.declare'{durable = true}),
637637

638638
Payload = <<"m1">>,
639639

@@ -657,7 +657,7 @@ large_content(Config) ->
657657
{ok, Connection} = new_connection(Config),
658658
{ok, Channel} = amqp_connection:open_channel(Connection),
659659
#'queue.declare_ok'{queue = Q}
660-
= amqp_channel:call(Channel, #'queue.declare'{}),
660+
= amqp_channel:call(Channel, #'queue.declare'{durable = true}),
661661
F = list_to_binary([rand:uniform(256)-1 || _ <- lists:seq(1, 1000)]),
662662
Payload = list_to_binary([F || _ <- lists:seq(1, 1000)]),
663663
Publish = #'basic.publish'{exchange = <<>>, routing_key = Q},
@@ -690,7 +690,7 @@ queue_exchange_binding(Channel, X, Parent, Tag) ->
690690
Q = list_to_binary(rabbit_misc:format("lifecycle.a.b.c.~b", [Tag])),
691691
Binding = <<"lifecycle.a.b.c.*">>,
692692
#'queue.declare_ok'{queue = Q1}
693-
= amqp_channel:call(Channel, #'queue.declare'{queue = Q}),
693+
= amqp_channel:call(Channel, #'queue.declare'{queue = Q, durable = true}),
694694
Q = Q1,
695695
Route = #'queue.bind'{queue = Q,
696696
exchange = X,
@@ -803,7 +803,7 @@ queue_unbind(Config) ->
803803
Payload = <<"foobar">>,
804804
{ok, Channel} = amqp_connection:open_channel(Connection),
805805
amqp_channel:call(Channel, #'exchange.declare'{exchange = X}),
806-
amqp_channel:call(Channel, #'queue.declare'{queue = Q}),
806+
amqp_channel:call(Channel, #'queue.declare'{queue = Q, durable = true}),
807807
Bind = #'queue.bind'{queue = Q,
808808
exchange = X,
809809
routing_key = Key},
@@ -845,7 +845,7 @@ async_sync_method_serialization(Config) ->
845845
"async_sync_method_serialization", Config,
846846
fun (Channel, _X) ->
847847
#'queue.declare_ok'{queue = Q} =
848-
amqp_channel:call(Channel, #'queue.declare'{}),
848+
amqp_channel:call(Channel, #'queue.declare'{durable = true}),
849849
Q
850850
end,
851851
fun (Channel, X, Payload, _, _) ->
@@ -995,7 +995,7 @@ rpc_client(Config) ->
995995
rpc_correlation_server(Channel, Q) ->
996996
ok = amqp_channel:register_return_handler(Channel, self()),
997997
#'queue.declare_ok'{queue = Q} =
998-
amqp_channel:call(Channel, #'queue.declare'{queue = Q}),
998+
amqp_channel:call(Channel, #'queue.declare'{queue = Q, durable = true}),
999999
#'basic.consume_ok'{} =
10001000
amqp_channel:call(Channel,
10011001
#'basic.consume'{queue = Q,
@@ -1042,7 +1042,7 @@ pub_and_close(Config) ->
10421042
NMessages = 50000,
10431043
{ok, Channel1} = amqp_connection:open_channel(Connection1),
10441044
#'queue.declare_ok'{queue = Q} =
1045-
amqp_channel:call(Channel1, #'queue.declare'{}),
1045+
amqp_channel:call(Channel1, #'queue.declare'{durable = true}),
10461046
%% Send messages
10471047
pc_producer_loop(Channel1, <<>>, Q, Payload, NMessages),
10481048
%% Close connection without closing channels
@@ -1178,7 +1178,7 @@ default_consumer(Config) ->
11781178
amqp_selective_consumer:register_default_consumer(Channel, self()),
11791179

11801180
#'queue.declare_ok'{queue = Q}
1181-
= amqp_channel:call(Channel, #'queue.declare'{}),
1181+
= amqp_channel:call(Channel, #'queue.declare'{durable = true}),
11821182
Pid = spawn(fun () -> receive
11831183
after 10000 -> ok
11841184
end

‎deps/rabbit/src/rabbit_amqqueue.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113

114114
-rabbit_deprecated_feature(
115115
{transient_nonexcl_queues,
116-
#{deprecation_phase => permitted_by_default,
116+
#{deprecation_phase => denied_by_default,
117117
doc_url => "https://blog.rabbitmq.com/posts/2021/08/4.0-deprecation-announcements/#removal-of-transient-non-exclusive-queues",
118118
callbacks => #{is_feature_used => {?MODULE, are_transient_nonexcl_used}}
119119
}}).
@@ -130,7 +130,7 @@ are_transient_nonexcl_used(_) ->
130130
NonExclQueues = [Q || Q <- Queues, not is_exclusive(Q)],
131131
length(NonExclQueues) > 0;
132132
{error, _} ->
133-
undefined
133+
false
134134
end
135135
end.
136136

‎deps/rabbit/test/amqp_client_SUITE.erl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ server_closes_link_exchange(Settled, Config) ->
19101910
RoutingKey = <<"my routing key">>,
19111911
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
19121912
#'exchange.declare_ok'{} = amqp_channel:call(Ch, #'exchange.declare'{exchange = XName}),
1913-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
1913+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
19141914
#'queue.bind_ok'{} = amqp_channel:call(Ch, #'queue.bind'{queue = QName,
19151915
exchange = XName,
19161916
routing_key = RoutingKey}),
@@ -2030,7 +2030,7 @@ target_queues_deleted_accepted(Config) ->
20302030
QNames = [Q1, Q2, Q3],
20312031
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
20322032
[begin
2033-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
2033+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
20342034
#'queue.bind_ok'{} = amqp_channel:call(Ch, #'queue.bind'{queue = QName,
20352035
exchange = <<"amq.fanout">>})
20362036
end || QName <- QNames],
@@ -3304,7 +3304,7 @@ detach_requeues_two_connections(QType, Config) ->
33043304
resource_alarm_before_session_begin(Config) ->
33053305
QName = atom_to_binary(?FUNCTION_NAME),
33063306
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
3307-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
3307+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
33083308
OpnConf = connection_config(Config),
33093309
{ok, Connection} = amqp10_client:open_connection(OpnConf),
33103310

@@ -3359,7 +3359,7 @@ resource_alarm_before_session_begin(Config) ->
33593359
resource_alarm_after_session_begin(Config) ->
33603360
QName = atom_to_binary(?FUNCTION_NAME),
33613361
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
3362-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
3362+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
33633363
Address = rabbitmq_amqp_address:queue(QName),
33643364
OpnConf = connection_config(Config),
33653365

@@ -3428,7 +3428,7 @@ resource_alarm_after_session_begin(Config) ->
34283428
resource_alarm_send_many(Config) ->
34293429
QName = atom_to_binary(?FUNCTION_NAME),
34303430
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
3431-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
3431+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
34323432
Address = rabbitmq_amqp_address:queue(QName),
34333433
OpnConf = connection_config(Config),
34343434
{ok, Connection} = amqp10_client:open_connection(OpnConf),
@@ -3491,7 +3491,7 @@ max_message_size_client_to_server(Config) ->
34913491

34923492
QName = atom_to_binary(?FUNCTION_NAME),
34933493
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
3494-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
3494+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
34953495
Address = rabbitmq_amqp_address:queue(QName),
34963496
OpnConf = connection_config(Config),
34973497
{ok, Connection} = amqp10_client:open_connection(OpnConf),
@@ -3520,7 +3520,7 @@ max_message_size_client_to_server(Config) ->
35203520
max_message_size_server_to_client(Config) ->
35213521
QName = atom_to_binary(?FUNCTION_NAME),
35223522
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
3523-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
3523+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
35243524
Address = rabbitmq_amqp_address:queue(QName),
35253525
OpnConf = connection_config(Config),
35263526
{ok, Connection} = amqp10_client:open_connection(OpnConf),
@@ -3575,7 +3575,7 @@ last_queue_confirms(Config) ->
35753575
Qs = [ClassicQ, QuorumQ],
35763576
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
35773577
#'queue.declare_ok'{} = amqp_channel:call(
3578-
Ch, #'queue.declare'{queue = ClassicQ}),
3578+
Ch, #'queue.declare'{queue = ClassicQ, durable = true}),
35793579
#'queue.declare_ok'{} = amqp_channel:call(
35803580
Ch, #'queue.declare'{
35813581
queue = QuorumQ,
@@ -3647,7 +3647,7 @@ target_queue_deleted(Config) ->
36473647
Qs = [ClassicQ, QuorumQ],
36483648
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
36493649
#'queue.declare_ok'{} = amqp_channel:call(
3650-
Ch, #'queue.declare'{queue = ClassicQ}),
3650+
Ch, #'queue.declare'{queue = ClassicQ, durable = true}),
36513651
#'queue.declare_ok'{} = amqp_channel:call(
36523652
Ch, #'queue.declare'{
36533653
queue = QuorumQ,
@@ -4749,7 +4749,7 @@ trace(Q, QType, Config) ->
47494749
queue = Q,
47504750
durable = true,
47514751
arguments = [{<<"x-queue-type">>, longstr, QType}]}),
4752-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = TraceQ}),
4752+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = TraceQ, durable = true}),
47534753
#'queue.bind_ok'{} = amqp_channel:call(
47544754
Ch, #'queue.bind'{queue = TraceQ,
47554755
exchange = <<"amq.rabbitmq.trace">>,
@@ -4869,7 +4869,7 @@ message_ttl(Config) ->
48694869
QName = atom_to_binary(?FUNCTION_NAME),
48704870
Address = rabbitmq_amqp_address:queue(QName),
48714871
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
4872-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
4872+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
48734873
ok = rabbit_ct_client_helpers:close_connection_and_channel(Conn, Ch),
48744874
OpnConf = connection_config(Config),
48754875
{ok, Connection} = amqp10_client:open_connection(OpnConf),
@@ -6190,7 +6190,7 @@ receive_many_auto_flow(QType, Config) ->
61906190
incoming_window_closed_transfer_flow_order(Config) ->
61916191
QName = atom_to_binary(?FUNCTION_NAME),
61926192
{Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config),
6193-
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName}),
6193+
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = QName, durable = true}),
61946194
ok = rabbit_ct_client_helpers:close_connection_and_channel(Conn, Ch),
61956195
Address = rabbitmq_amqp_address:queue(QName),
61966196
OpnConf = connection_config(Config),

‎deps/rabbit/test/amqp_dotnet_SUITE.erl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@ suite() ->
5858

5959
init_per_suite(Config) ->
6060
rabbit_ct_helpers:log_environment(),
61-
Config.
61+
%% Remove when transient_nonexcl_queues is removed entirely,
62+
%% and fix the .NET tests.
63+
rabbit_ct_helpers:merge_app_env(
64+
Config,
65+
{rabbit,
66+
[{permit_deprecated_features, #{transient_nonexcl_queues => true}}]}).
6267

6368
end_per_suite(Config) ->
6469
Config.

‎deps/rabbit/test/channel_interceptor_SUITE.erl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ register_interceptor1(Config, Interceptor) ->
7373
Ch1 = rabbit_ct_client_helpers:open_channel(Config, 0),
7474

7575
QName = <<"register_interceptor-q">>,
76-
amqp_channel:call(Ch1, #'queue.declare'{queue = QName}),
76+
amqp_channel:call(Ch1, #'queue.declare'{queue = QName, durable = true}),
7777

7878
[ChannelProc] = rabbit_channel:list() -- PredefinedChannels,
7979

@@ -118,11 +118,11 @@ register_interceptor_failing_with_amqp_error1(Config, Interceptor) ->
118118

119119
Q1 = <<"succeeding-q">>,
120120
#'queue.declare_ok'{} =
121-
amqp_channel:call(Ch1, #'queue.declare'{queue = Q1}),
121+
amqp_channel:call(Ch1, #'queue.declare'{queue = Q1, durable = true}),
122122

123123
Q2 = <<"failing-with-amqp-error-q">>,
124124
try
125-
amqp_channel:call(Ch1, #'queue.declare'{queue = Q2})
125+
amqp_channel:call(Ch1, #'queue.declare'{queue = Q2, durable = true})
126126
catch
127127
_:Reason ->
128128
?assertMatch(
@@ -138,7 +138,7 @@ register_interceptor_failing_with_amqp_error1(Config, Interceptor) ->
138138
[{interceptors, []}] = rabbit_channel:info(ChannelProc1, [interceptors]),
139139

140140
#'queue.declare_ok'{} =
141-
amqp_channel:call(Ch2, #'queue.declare'{queue = Q2}),
141+
amqp_channel:call(Ch2, #'queue.declare'{queue = Q2, durable = true}),
142142

143143
#'queue.delete_ok'{} = amqp_channel:call(Ch2, #'queue.delete' {queue = Q1}),
144144
#'queue.delete_ok'{} = amqp_channel:call(Ch2, #'queue.delete' {queue = Q2}),
@@ -167,11 +167,11 @@ register_interceptor_crashing_with_amqp_error_exception1(Config, Interceptor) ->
167167

168168
Q1 = <<"succeeding-q">>,
169169
#'queue.declare_ok'{} =
170-
amqp_channel:call(Ch1, #'queue.declare'{queue = Q1}),
170+
amqp_channel:call(Ch1, #'queue.declare'{queue = Q1, durable = true}),
171171

172172
Q2 = <<"crashing-with-amqp-exception-q">>,
173173
try
174-
amqp_channel:call(Ch1, #'queue.declare'{queue = Q2})
174+
amqp_channel:call(Ch1, #'queue.declare'{queue = Q2, durable = true})
175175
catch
176176
_:Reason ->
177177
?assertMatch(
@@ -187,7 +187,7 @@ register_interceptor_crashing_with_amqp_error_exception1(Config, Interceptor) ->
187187
[{interceptors, []}] = rabbit_channel:info(ChannelProc1, [interceptors]),
188188

189189
#'queue.declare_ok'{} =
190-
amqp_channel:call(Ch2, #'queue.declare'{queue = Q2}),
190+
amqp_channel:call(Ch2, #'queue.declare'{queue = Q2, durable = true}),
191191

192192
#'queue.delete_ok'{} = amqp_channel:call(Ch2, #'queue.delete' {queue = Q1}),
193193
#'queue.delete_ok'{} = amqp_channel:call(Ch2, #'queue.delete' {queue = Q2}),

‎deps/rabbit/test/cluster_SUITE.erl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ declare_on_dead_queue1(_Config, SecondaryNode) ->
208208
Self = self(),
209209
Pid = spawn(SecondaryNode,
210210
fun () ->
211-
{new, Q} = rabbit_amqqueue:declare(QueueName, false, false, [], none, <<"acting-user">>),
211+
{new, Q} = rabbit_amqqueue:declare(QueueName, true, false, [], none, <<"acting-user">>),
212212
QueueName = ?amqqueue_field_name(Q),
213213
QPid = ?amqqueue_field_pid(Q),
214214
exit(QPid, kill),
@@ -252,7 +252,7 @@ must_exit(Fun) ->
252252
end.
253253

254254
dead_queue_loop(QueueName, OldPid) ->
255-
{existing, Q} = rabbit_amqqueue:declare(QueueName, false, false, [], none, <<"acting-user">>),
255+
{existing, Q} = rabbit_amqqueue:declare(QueueName, true, false, [], none, <<"acting-user">>),
256256
QPid = ?amqqueue_field_pid(Q),
257257
case QPid of
258258
OldPid -> timer:sleep(25),

‎deps/rabbit/test/cluster_minority_SUITE.erl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ init_per_group(Group, Config0) when Group == client_operations;
9292
Ch = rabbit_ct_client_helpers:open_channel(Config1, 0),
9393
%% To be used in consume_from_queue
9494
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = <<"test-queue">>,
95+
durable = true,
9596
arguments = [{<<"x-queue-type">>, longstr, <<"classic">>}]}),
9697
%% To be used in consume_from_queue
9798
#'queue.declare_ok'{} = amqp_channel:call(Ch, #'queue.declare'{queue = <<"test-queue-delete-classic">>,
@@ -217,7 +218,7 @@ declare_queue(Config) ->
217218
[A | _] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
218219
{_, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, A),
219220
?assertExit({{shutdown, {connection_closing, {server_initiated_close, 541, _}}}, _},
220-
amqp_channel:call(Ch, #'queue.declare'{queue = <<"test-queue-2">>})).
221+
amqp_channel:call(Ch, #'queue.declare'{queue = <<"test-queue-2">>, durable = true})).
221222

222223
delete_queue(Config) ->
223224
[A | _] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),

‎deps/rabbit/test/clustering_recovery_SUITE.erl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,13 @@ init_per_testcase(Testcase, Config) ->
128128
rabbit_ct_helpers:testcase_started(Config, Testcase),
129129
ClusterSize = ?config(rmq_nodes_count, Config),
130130
TestNumber = rabbit_ct_helpers:testcase_number(Config, ?MODULE, Testcase),
131-
Config1 = rabbit_ct_helpers:set_config(Config, [
131+
%% Remove when transient_nonexcl_queues is removed entirely
132+
%% and remove the corresponding tests.
133+
Config0 = rabbit_ct_helpers:merge_app_env(
134+
Config,
135+
{rabbit,
136+
[{permit_deprecated_features, #{transient_nonexcl_queues => true}}]}),
137+
Config1 = rabbit_ct_helpers:set_config(Config0, [
132138
{rmq_nodename_suffix, Testcase},
133139
{tcp_ports_base, {skip_n_nodes, TestNumber * ClusterSize}},
134140
{keep_pid_file_on_exit, true}

0 commit comments

Comments
 (0)