More

Author: lhoguin

deps/rabbitmq_auth_backend_ldap/test/system_SUITE.erl

@@ -518,8 +518,8 @@ match_bidirectional(Config) ->
 
     [begin
          set_env(Config, ConfigurationFunction()),
-         Q1 = [#'queue.declare'{queue = <<"Alice-queue">>}],
-         Q2 = [#'queue.declare'{queue = <<"Ali">>}],
+         Q1 = [#'queue.declare'{queue = <<"Alice-queue">>, durable = true}],
+         Q2 = [#'queue.declare'{queue = <<"Ali">>, durable = true}],
          P = #amqp_params_network{port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp)},
          [test_resource(PTR) || PTR <- [{P?ALICE, Q1, ok},
                                         {P?ALICE, Q2, fail}]]
@@ -537,8 +537,8 @@ match_bidirectional_gh_100(Config) ->
 
     [begin
          set_env(Config, ConfigurationFunction()),
-         Q1 = [#'queue.declare'{queue = <<"Jimmy-queue">>}],
-         Q2 = [#'queue.declare'{queue = <<"Jimmy">>}],
+         Q1 = [#'queue.declare'{queue = <<"Jimmy-queue">>, durable = true}],
+         Q2 = [#'queue.declare'{queue = <<"Jimmy">>, durable = true}],
          P = #amqp_params_network{port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp)},
          [test_resource(PTR) || PTR <- [{P?JIMMY, Q1, ok},
                                         {P?JIMMY, Q2, ok}]]
@@ -765,15 +765,15 @@ in_group(Config) ->
                         {B?BOB, X, fail}]).
 
 const(Config) ->
-    Q = [#'queue.declare'{queue = <<"test">>}],
+    Q = [#'queue.declare'{queue = <<"test">>, durable = true}],
     B = #amqp_params_network{port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp)},
     test_resources([{B?ALICE, Q, ok},
                         {B?BOB, Q, fail}]).
 
 string_match(Config) ->
     B = fun(N) ->
                 [#'exchange.declare'{exchange = N},
-                 #'queue.declare'{queue = <<"test">>},
+                 #'queue.declare'{queue = <<"test">>, durable = true},
                  #'queue.bind'{exchange = N, queue = <<"test">>}]
         end,
     P = #amqp_params_network{port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp)},
@@ -782,9 +782,9 @@ string_match(Config) ->
                         {P?ALICE, B(<<"xch-Someone Else-abc123">>),    fail}]).
 
 boolean_logic(Config) ->
-    Q1 = [#'queue.declare'{queue = <<"test1">>},
+    Q1 = [#'queue.declare'{queue = <<"test1">>, durable = true},
           #'basic.consume'{queue = <<"test1">>}],
-    Q2 = [#'queue.declare'{queue = <<"test2">>},
+    Q2 = [#'queue.declare'{queue = <<"test2">>, durable = true},
           #'basic.consume'{queue = <<"test2">>}],
     P = #amqp_params_network{port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp)},
     [test_resource(PTR) || PTR <- [{P?ALICE, Q1, ok},
@@ -795,7 +795,7 @@ boolean_logic(Config) ->
 permission_match(Config) ->
     B = fun(N) ->
                 [#'exchange.declare'{exchange = N},
-                 #'queue.declare'{queue = <<"prefix-test">>},
+                 #'queue.declare'{queue = <<"prefix-test">>, durable = true},
                  #'queue.bind'{exchange = N, queue = <<"prefix-test">>}]
         end,
     P = #amqp_params_network{port = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_port_amqp)},

deps/rabbitmq_event_exchange/test/system_SUITE.erl

@@ -276,7 +276,7 @@ audit_vhost_deletion(Config) ->
     {ok, Ch2} = amqp_connection:open_channel(Conn),
 
     %% The user that creates the queue is the connection one, not the vhost creator
-    #'queue.declare_ok'{queue = _Q} = amqp_channel:call(Ch2, #'queue.declare'{}),
+    #'queue.declare_ok'{queue = _Q} = amqp_channel:call(Ch2, #'queue.declare'{durable = true}),
     receive_user_in_event(<<"queue.created">>, ConnUser, Config),
     ok = rabbit_ct_client_helpers:close_connection_and_channel(Conn, Ch2),
 

deps/rabbitmq_management/test/clustering_SUITE.erl

@@ -346,7 +346,7 @@ queue_consumer_channel_closed(Config) ->
     ok.
 
 queue(Config) ->
-    http_put(Config, "/queues/%2F/some-queue", none, [?CREATED, ?NO_CONTENT]),
+    http_put(Config, "/queues/%2F/some-queue", #{"durable" => true}, [?CREATED, ?NO_CONTENT]),
     _ = wait_for_queue(Config, "/queues/%2F/some-queue"),
 
     {ok, Chan}  = amqp_connection:open_channel(?config(conn, Config)),
@@ -371,7 +371,7 @@ queue(Config) ->
     ok.
 
 queues_single(Config) ->
-    http_put(Config, "/queues/%2F/some-queue", none, [?CREATED, ?NO_CONTENT]),
+    http_put(Config, "/queues/%2F/some-queue", #{"durable" => true}, [?CREATED, ?NO_CONTENT]),
     _ = wait_for_queue(Config, "/queues/%2F/some-queue"),
 
     eventually(?_assertMatch(
@@ -419,7 +419,7 @@ queues_multiple(Config) ->
     ok.
 
 queues_removed(Config) ->
-    http_put(Config, "/queues/%2F/some-queue", none, [?CREATED, ?NO_CONTENT]),
+    http_put(Config, "/queues/%2F/some-queue", #{"durable" => true}, [?CREATED, ?NO_CONTENT]),
     force_stats(Config),
     N = length(http_get(Config, "/queues/%2F")),
     http_delete(Config, "/queues/%2F/some-queue", ?NO_CONTENT),
@@ -504,7 +504,7 @@ channel(Config) ->
 
 channel_other_node(Config) ->
     Q = <<"some-queue">>,
-    http_put(Config, "/queues/%2F/some-queue", none, [?CREATED, ?NO_CONTENT]),
+    http_put(Config, "/queues/%2F/some-queue", #{"durable" => true}, [?CREATED, ?NO_CONTENT]),
     Conn = rabbit_ct_client_helpers:open_unmanaged_connection(Config, 1),
     {ok, Chan} = amqp_connection:open_channel(Conn),
     [{_, ChData}] = rabbit_ct_broker_helpers:rpc(Config, 1, ets, tab2list,
@@ -859,12 +859,12 @@ exchange_declare(Chan, Name) ->
     #'exchange.declare_ok'{} = amqp_channel:call(Chan, Declare).
 
 queue_declare(Chan) ->
-    Declare = #'queue.declare'{},
+    Declare = #'queue.declare'{durable = true},
     #'queue.declare_ok'{queue = Q} = amqp_channel:call(Chan, Declare),
     Q.
 
 queue_declare(Chan, Name) ->
-    Declare = #'queue.declare'{queue = Name},
+    Declare = #'queue.declare'{queue = Name, durable = true},
     #'queue.declare_ok'{queue = Q} = amqp_channel:call(Chan, Declare),
     Q.