diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confirms_rejects_SUITE.erl | 4 | ||||
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/rabbit_fifo_prop_SUITE.erl | 22 |
3 files changed, 20 insertions, 8 deletions
diff --git a/test/confirms_rejects_SUITE.erl b/test/confirms_rejects_SUITE.erl index 010354d020..3ac944f99b 100644 --- a/test/confirms_rejects_SUITE.erl +++ b/test/confirms_rejects_SUITE.erl @@ -35,7 +35,7 @@ init_per_group(Group, Config) -> rabbit_ct_broker_helpers:setup_steps() ++ rabbit_ct_client_helpers:setup_steps()). -end_per_group(Group, Config) -> +end_per_group(_Group, Config) -> rabbit_ct_helpers:run_steps(Config, rabbit_ct_client_helpers:teardown_steps() ++ rabbit_ct_broker_helpers:teardown_steps()). @@ -153,4 +153,4 @@ clean_acks_mailbox() -> {'basic.nack', _, _, _} -> clean_acks_mailbox() after 1000 -> done - end.
\ No newline at end of file + end. diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index d698618494..6f06f3b874 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -1988,7 +1988,7 @@ subscribe_redelivery_count(Config) -> {#'basic.deliver'{delivery_tag = DeliveryTag, redelivered = false}, #amqp_msg{props = #'P_basic'{headers = H0}}} -> - ?assertMatch({DTag, _, 0}, rabbit_basic:header(DTag, H0)), + ?assertMatch(undefined, rabbit_basic:header(DTag, H0)), amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag, multiple = false, requeue = true}) diff --git a/test/rabbit_fifo_prop_SUITE.erl b/test/rabbit_fifo_prop_SUITE.erl index 1c1ab42a9e..1af0d3b4b0 100644 --- a/test/rabbit_fifo_prop_SUITE.erl +++ b/test/rabbit_fifo_prop_SUITE.erl @@ -278,8 +278,16 @@ handle_op(purge, T) -> do_apply(Cmd, #t{effects = Effs, index = Index, state = S0, log = Log} = T) -> - {S, Effects, _} = rabbit_fifo:apply(#{index => Index}, Cmd, [], S0), - T#t{state = S, + {St, Effects} = case rabbit_fifo:apply(#{index => Index}, Cmd, S0) of + {S, _, E} when is_list(E) -> + {S, E}; + {S, _, E} -> + {S, [E]}; + {S, _} -> + {S, []} + end, + + T#t{state = St, index = Index + 1, effects = enq_effs(Effects, Effs), log = [Cmd | Log]}. @@ -338,9 +346,13 @@ prefixes(Source, N, Acc) -> run_log(InitState, Entries) -> lists:foldl(fun ({Idx, E}, {Acc0, Efx0}) -> - case rabbit_fifo:apply(meta(Idx), E, Efx0, Acc0) of - {Acc, Efx, _} -> - {Acc, Efx} + case rabbit_fifo:apply(meta(Idx), E, Acc0) of + {Acc, _, Efx} when is_list(Efx) -> + {Acc, Efx0 ++ Efx}; + {Acc, _, Efx} -> + {Acc, Efx0 ++ [Efx]}; + {Acc, _} -> + {Acc, Efx0} end end, {InitState, []}, Entries). |