diff options
| author | Karl Nilsson <kjnilsson@gmail.com> | 2019-10-18 11:05:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 11:05:51 +0100 |
| commit | e0152b984880340a57c0d19942a0bd7de73b79ad (patch) | |
| tree | 99d264fba203439c2dbd847bb511a61265285124 /test | |
| parent | aababf721c0268d5c29122148635f0b357d765b8 (diff) | |
| parent | d48cff40509e6cd19bb75aad82a88a2a0b95453e (diff) | |
| download | rabbitmq-server-git-e0152b984880340a57c0d19942a0bd7de73b79ad.tar.gz | |
Merge pull request #2138 from rabbitmq/optimise-qq-memory-use
Optimise QQ memory use
Diffstat (limited to 'test')
| -rw-r--r-- | test/rabbit_fifo_SUITE.erl | 8 | ||||
| -rw-r--r-- | test/rabbit_fifo_prop_SUITE.erl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/rabbit_fifo_SUITE.erl b/test/rabbit_fifo_SUITE.erl index 0a0ac94e63..0d9acfa1fa 100644 --- a/test/rabbit_fifo_SUITE.erl +++ b/test/rabbit_fifo_SUITE.erl @@ -444,12 +444,12 @@ discarded_message_without_dead_letter_handler_is_removed_test(_) -> {State0, [_, _]} = enq(1, 1, first, test_init(test)), {State1, Effects1} = check_n(Cid, 2, 10, State0), ?ASSERT_EFF({send_msg, _, - {delivery, _, [{0, {#{}, first}}]}, _}, + {delivery, _, [{0, {_, first}}]}, _}, Effects1), {_State2, _, Effects2} = apply(meta(1), rabbit_fifo:make_discard(Cid, [0]), State1), ?assertNoEffect({send_msg, _, - {delivery, _, [{0, {#{}, first}}]}, _}, + {delivery, _, [{0, {_, first}}]}, _}, Effects2), ok. @@ -462,7 +462,7 @@ discarded_message_with_dead_letter_handler_emits_mod_call_effect_test(_) -> {State0, [_, _]} = enq(1, 1, first, State00), {State1, Effects1} = check_n(Cid, 2, 10, State0), ?ASSERT_EFF({send_msg, _, - {delivery, _, [{0, {#{}, first}}]}, _}, + {delivery, _, [{0, {_, first}}]}, _}, Effects1), {_State2, _, Effects2} = apply(meta(1), rabbit_fifo:make_discard(Cid, [0]), State1), % assert mod call effect with appended reason and message @@ -502,7 +502,7 @@ delivery_query_returns_deliveries_test(_) -> Entries = lists:zip(Indexes, Commands), {State, _Effects} = run_log(test_init(help), Entries), % 3 deliveries are returned - [{0, {#{}, one}}] = rabbit_fifo:get_checked_out(Cid, 0, 0, State), + [{0, {_, one}}] = rabbit_fifo:get_checked_out(Cid, 0, 0, State), [_, _, _] = rabbit_fifo:get_checked_out(Cid, 1, 3, State), ok. diff --git a/test/rabbit_fifo_prop_SUITE.erl b/test/rabbit_fifo_prop_SUITE.erl index 0b947a9d1d..e0fced2de3 100644 --- a/test/rabbit_fifo_prop_SUITE.erl +++ b/test/rabbit_fifo_prop_SUITE.erl @@ -691,7 +691,7 @@ single_active_prop(Conf0, Commands, ValidateOrder) -> validate_msg_order(_, [], S) -> S; validate_msg_order(Cid, [{_, {H, Num}} | Rem], PrevMax) -> - Redelivered = maps:is_key(delivery_count, H), + Redelivered = is_map(H) andalso maps:is_key(delivery_count, H), case undefined of _ when Num == PrevMax + 1 -> %% forwards case |