diff options
| author | kjnilsson <knilsson@pivotal.io> | 2020-03-02 11:01:23 +0000 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2020-03-02 11:01:23 +0000 |
| commit | 9ab6c49f78683d076cad2e30b379f56431a55ce1 (patch) | |
| tree | 753ce76580e7e3bf8afd865379556eea4c9b73d8 /test | |
| parent | f008fb3d463e07fbd649f316e98fcf08e4904168 (diff) | |
| download | rabbitmq-server-git-9ab6c49f78683d076cad2e30b379f56431a55ce1.tar.gz | |
rabbit_fifo: release cursor effect ordering
Ensure release cursors are added to the end of the effects list rather
than the front as there may be effects such as log effects that require
log entries that may be truncated by the release cursor effect to be
present.
Diffstat (limited to 'test')
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 4 | ||||
| -rw-r--r-- | test/rabbit_fifo_prop_SUITE.erl | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index 0fd76dd0fb..c340c76dda 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -1431,7 +1431,7 @@ delete_member_not_a_member(Config) -> [<<"/">>, QQ, Server])). delete_member_during_node_down(Config) -> - [Server, DownServer, _] = rabbit_ct_broker_helpers:get_node_configs( + [Server, DownServer, Remove] = rabbit_ct_broker_helpers:get_node_configs( Config, nodename), stop_node(Config, DownServer), @@ -1441,7 +1441,7 @@ delete_member_during_node_down(Config) -> declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])), timer:sleep(200), ?assertEqual(ok, rpc:call(Server, rabbit_quorum_queue, delete_member, - [<<"/">>, QQ, Server])), + [<<"/">>, QQ, Remove])), rabbit_ct_broker_helpers:start_node(Config, DownServer), ?assertEqual(ok, rpc:call(Server, rabbit_quorum_queue, repair_amqqueue_nodes, diff --git a/test/rabbit_fifo_prop_SUITE.erl b/test/rabbit_fifo_prop_SUITE.erl index d79dac5b6f..0cd502c403 100644 --- a/test/rabbit_fifo_prop_SUITE.erl +++ b/test/rabbit_fifo_prop_SUITE.erl @@ -605,7 +605,8 @@ in_memory_limit(_Config) -> Size = 2000, run_proper( fun () -> - ?FORALL({Length, Bytes, SingleActiveConsumer, DeliveryLimit, InMemoryLength, InMemoryBytes}, + ?FORALL({Length, Bytes, SingleActiveConsumer, DeliveryLimit, + InMemoryLength, InMemoryBytes}, frequency([{10, {0, 0, false, 0, 0, 0}}, {5, {oneof([range(1, 10), undefined]), oneof([range(1, 1000), undefined]), @@ -665,6 +666,8 @@ in_memory_limit_prop(Conf0, Commands) -> false end. +validate_idx_order([], _ReleaseCursorIdx) -> + true; validate_idx_order(Idxs, ReleaseCursorIdx) -> Min = lists:min(Idxs), case Min < ReleaseCursorIdx of |