summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-15 17:29:51 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-07-15 17:29:51 +0100
commitfb0af1dafee8e1ef0e3abcbb3e54a378b3b9f3fd (patch)
treee535f495c227f71cba7658014fa33260b0c3d884
parent1f45c319d6c1bd42ea0a1cf0eb91335c40430fdb (diff)
downloadrabbitmq-server-fb0af1dafee8e1ef0e3abcbb3e54a378b3b9f3fd.tar.gz
increase a timeout
-rw-r--r--src/rabbit_tests.erl9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 615a04c7..56c7f2f5 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -60,7 +60,6 @@ all_tests() ->
passed = test_confirms(),
passed = maybe_run_cluster_dependent_tests(),
passed = test_configurable_server_properties(),
- ok = cleanup_test_queue(),
ok = restart_app(),
passed.
@@ -1913,12 +1912,6 @@ with_empty_test_queue(Fun) ->
{0, Qi} = init_test_queue(),
rabbit_queue_index:delete_and_terminate(Fun(Qi)).
-cleanup_test_queue() ->
- %% the test queue's already there; let's remove it
- {_, Q} = rabbit_amqqueue:declare(test_queue(), true, false, [], none),
- {ok, _} = rabbit_amqqueue:delete(Q, false, false),
- ok.
-
restart_app() ->
rabbit:stop(),
rabbit:start().
@@ -2162,7 +2155,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.