diff options
| author | kjnilsson <knilsson@pivotal.io> | 2020-10-07 13:05:25 +0100 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2020-10-07 13:05:25 +0100 |
| commit | 32543acda0fe8823bfe709015161c03037179f38 (patch) | |
| tree | 6133eb0db8257a3062f7de79c58d7ace84bdbff4 | |
| parent | fe56296805817bc6f6e81dd60ca3cf541e7c2c3d (diff) | |
| download | rabbitmq-server-git-32543acda0fe8823bfe709015161c03037179f38.tar.gz | |
Fix mixed-versions test assertion
To wait for both new and old confirm message formats.
| -rw-r--r-- | test/backing_queue_SUITE.erl | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/test/backing_queue_SUITE.erl b/test/backing_queue_SUITE.erl index ff37e1fb04..be6004c8b9 100644 --- a/test/backing_queue_SUITE.erl +++ b/test/backing_queue_SUITE.erl @@ -1384,16 +1384,21 @@ publish_and_confirm(Q, Payload, Count) -> wait_for_confirms(Unconfirmed) -> case gb_sets:is_empty(Unconfirmed) of true -> ok; - false -> receive {'$gen_cast', - {queue_event, _QName, - {confirm, Confirmed, _}}} -> - wait_for_confirms( - rabbit_misc:gb_sets_difference( - Unconfirmed, gb_sets:from_list(Confirmed))) - after ?TIMEOUT -> - flush(), - exit(timeout_waiting_for_confirm) - end + false -> + receive + {'$gen_cast', + {queue_event, _QName, {confirm, Confirmed, _}}} -> + wait_for_confirms( + rabbit_misc:gb_sets_difference( + Unconfirmed, gb_sets:from_list(Confirmed))); + {'$gen_cast', {confirm, Confirmed, _}} -> + wait_for_confirms( + rabbit_misc:gb_sets_difference( + Unconfirmed, gb_sets:from_list(Confirmed))) + after ?TIMEOUT -> + flush(), + exit(timeout_waiting_for_confirm) + end end. with_fresh_variable_queue(Fun, Mode) -> |