diff options
| -rw-r--r-- | src/rabbit_queue_type.erl | 17 | ||||
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 42 | ||||
| -rw-r--r-- | test/rabbit_stream_queue_SUITE.erl | 41 |
3 files changed, 0 insertions, 100 deletions
diff --git a/src/rabbit_queue_type.erl b/src/rabbit_queue_type.erl index 8424ee5d15..a357c5e334 100644 --- a/src/rabbit_queue_type.erl +++ b/src/rabbit_queue_type.erl @@ -213,9 +213,6 @@ is_enabled(Type) -> rabbit_types:channel_exit(). declare(Q, Node) -> Mod = amqqueue:get_type(Q), - Capabilities = Mod:capabilities(), - ValidQueueArgs = maps:get(queue_arguments, Capabilities, []), - check_invalid_arguments(amqqueue:get_name(Q), amqqueue:get_arguments(Q), ValidQueueArgs), Mod:declare(Q, Node). -spec delete(amqqueue:amqqueue(), boolean(), @@ -328,9 +325,6 @@ new(Q, State) when ?is_amqqueue(Q) -> consume(Q, Spec, State) -> #ctx{state = State0} = Ctx = get_ctx(Q, State), Mod = amqqueue:get_type(Q), - Capabilities = Mod:capabilities(), - ValidConsumerArgs = maps:get(consumer_arguments, Capabilities, []), - check_invalid_arguments(amqqueue:get_name(Q), maps:get(args, Spec), ValidConsumerArgs), case Mod:consume(Q, Spec, State0) of {ok, CtxState, Actions} -> return_ok(set_ctx(Q, Ctx#ctx{state = CtxState}, State), Actions); @@ -571,14 +565,3 @@ return_ok(State0, Actions0) -> {S, [Act | A0]} end, {State0, []}, Actions0), {ok, State, lists:reverse(Actions)}. - - -check_invalid_arguments(QueueName, Args, Keys) -> - [case lists:member(Arg, Keys) of - true -> ok; - false -> rabbit_misc:protocol_error( - precondition_failed, - "invalid arg '~s' for ~s", - [Arg, rabbit_misc:rs(QueueName)]) - end || {Arg, _, _} <- Args], - ok. diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index 97b2235411..8a2bf7f5d9 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -89,7 +89,6 @@ groups() -> all_tests() -> [ declare_args, - declare_invalid_args, declare_invalid_properties, declare_server_named, start_queue, @@ -338,47 +337,6 @@ declare_invalid_properties(Config) -> durable = false, arguments = [{<<"x-queue-type">>, longstr, <<"quorum">>}]})). -declare_invalid_args(Config) -> - Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), - LQ = ?config(queue_name, Config), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - LQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}, - {<<"x-message-ttl">>, long, 2000}])), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - LQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}, - {<<"x-max-priority">>, long, 2000}])), - - [?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - LQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}, - {<<"x-overflow">>, longstr, XOverflow}])) - || XOverflow <- [<<"reject-publish-dlx">>]], - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - LQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}, - {<<"x-queue-mode">>, longstr, <<"lazy">>}])), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - LQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}, - {<<"x-quorum-initial-group-size">>, longstr, <<"hop">>}])), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - LQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}, - {<<"x-quorum-initial-group-size">>, long, 0}])). - declare_server_named(Config) -> Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), diff --git a/test/rabbit_stream_queue_SUITE.erl b/test/rabbit_stream_queue_SUITE.erl index d01a93e16e..5bc4c2a5ad 100644 --- a/test/rabbit_stream_queue_SUITE.erl +++ b/test/rabbit_stream_queue_SUITE.erl @@ -59,7 +59,6 @@ all_tests() -> [ declare_args, declare_max_age, - declare_invalid_args, declare_invalid_properties, declare_server_named, declare_queue, @@ -226,46 +225,6 @@ declare_invalid_properties(Config) -> durable = false, arguments = [{<<"x-queue-type">>, longstr, <<"stream">>}]})). -declare_invalid_args(Config) -> - Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), - Q = ?config(queue_name, Config), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - Q, [{<<"x-queue-type">>, longstr, <<"stream">>}, - {<<"x-expires">>, long, 2000}])), - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - Q, [{<<"x-queue-type">>, longstr, <<"stream">>}, - {<<"x-message-ttl">>, long, 2000}])), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - Q, [{<<"x-queue-type">>, longstr, <<"stream">>}, - {<<"x-max-priority">>, long, 2000}])), - - [?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - Q, [{<<"x-queue-type">>, longstr, <<"stream">>}, - {<<"x-overflow">>, longstr, XOverflow}])) - || XOverflow <- [<<"reject-publish">>, <<"reject-publish-dlx">>]], - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - Q, [{<<"x-queue-type">>, longstr, <<"stream">>}, - {<<"x-queue-mode">>, longstr, <<"lazy">>}])), - - ?assertExit( - {{shutdown, {server_initiated_close, 406, _}}, _}, - declare(rabbit_ct_client_helpers:open_channel(Config, Server), - Q, [{<<"x-queue-type">>, longstr, <<"stream">>}, - {<<"x-quorum-initial-group-size">>, longstr, <<"hop">>}])). - declare_server_named(Config) -> Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), |