root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

CQv2 prop: Don't make cmd_publish_msg use confirms 

The test suite was not checking them anyway, and channels are
a better fit for this kind of test.
This commit is contained in:
Loïc Hoguin 2022-02-03 10:21:40 +01:00
parent c3ded33872
commit fd8380ebdc
No known key found for this signature in database
GPG Key ID: C69E26E3A9DF618F
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/rabbit/test/classic_queue_prop_SUITE.erl vendored
View File

@ -25,8 +25,6 @@
name :: atom(),
mode :: classic | lazy,
version :: 1 | 2,
%% @todo durable?
%% @todo auto_delete?
%% We have one queue per way of publishing messages (such as channels).
%% We can only confirm the publish order on a per-channel level because
@ -301,7 +299,7 @@ command(St) ->
{100, {call, ?MODULE, cmd_set_version, [St, oneof([1, 2])]}},
{100, {call, ?MODULE, cmd_set_mode_version, [oneof([default, lazy]), oneof([1, 2])]}},
%% These are direct operations using internal functions.
{100, {call, ?MODULE, cmd_publish_msg, [St, integer(0, 1024*1024), integer(1, 2), boolean(), boolean(), expiration()]}},
{100, {call, ?MODULE, cmd_publish_msg, [St, integer(0, 1024*1024), integer(1, 2), boolean(), expiration()]}},
{100, {call, ?MODULE, cmd_basic_get_msg, [St]}},
{100, {call, ?MODULE, cmd_purge, [St]}},
%% These are channel-based operations.
@ -861,17 +859,15 @@ do_set_policy(Mode, Version) ->
{<<"queue-version">>, Version}],
0, <<"queues">>, <<"acting-user">>).
cmd_publish_msg(St=#cq{amq=AMQ}, PayloadSize, DeliveryMode, Confirm, Mandatory, Expiration) ->
?DEBUG("~0p ~0p ~0p ~0p ~0p ~0p", [St, PayloadSize, DeliveryMode, Confirm, Mandatory, Expiration]),
cmd_publish_msg(St=#cq{amq=AMQ}, PayloadSize, DeliveryMode, Mandatory, Expiration) ->
?DEBUG("~0p ~0p ~0p ~0p ~0p", [St, PayloadSize, DeliveryMode, Mandatory, Expiration]),
Payload = do_rand_payload(PayloadSize),
Msg = rabbit_basic:message(rabbit_misc:r(<<>>, exchange, <<>>),
<<>>, #'P_basic'{delivery_mode = DeliveryMode,
expiration = do_encode_expiration(Expiration)},
Payload),
Delivery = #delivery{mandatory = Mandatory, sender = self(),
%% @todo Probably need to do something about Confirm?
confirm = Confirm, message = Msg,% msg_seq_no = Seq,
flow = noflow},
confirm = false, message = Msg, flow = noflow},
ok = rabbit_amqqueue:deliver([AMQ], Delivery),
{MsgProps, MsgPayload} = rabbit_basic_common:from_content(Msg#basic_message.content),
#amqp_msg{props=MsgProps, payload=MsgPayload}.