diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-07-18 18:39:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-07-18 18:39:13 +0100 |
| commit | 97b6abe0842247b2a2b8f64fc9c91befef6ec79a (patch) | |
| tree | 52e651f0a2347214879c8ad1d22286b5f33ad064 | |
| parent | 252f1a5efeda64ca4ccd3ae48c2cad31739357b4 (diff) | |
| parent | 0444295d7dfb4d54c58b30ded369e06b1eeb5eb0 (diff) | |
| download | rabbitmq-server-97b6abe0842247b2a2b8f64fc9c91befef6ec79a.tar.gz | |
Merge bug24262.
| -rw-r--r-- | src/rabbit_tests.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 63676fef..2e454411 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1672,6 +1672,10 @@ test_backing_queue() -> passed = test_queue_recover(), application:set_env(rabbit, queue_index_max_journal_entries, MaxJournal, infinity), + %% We will have restarted the message store, and thus changed + %% the order of the children of rabbit_sup. This will cause + %% problems if there are subsequent failures - see bug 24262. + ok = restart_app(), passed; _ -> passed @@ -1911,6 +1915,10 @@ with_empty_test_queue(Fun) -> {0, Qi} = init_test_queue(), rabbit_queue_index:delete_and_terminate(Fun(Qi)). +restart_app() -> + rabbit:stop(), + rabbit:start(). + queue_index_publish(SeqIds, Persistent, Qi) -> Ref = rabbit_guid:guid(), MsgStore = case Persistent of @@ -2150,7 +2158,7 @@ wait_for_confirms(Unconfirmed) -> wait_for_confirms( gb_sets:difference(Unconfirmed, gb_sets:from_list(Confirmed))) - after 1000 -> exit(timeout_waiting_for_confirm) + after 5000 -> exit(timeout_waiting_for_confirm) end end. |