summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-05-17 11:15:58 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-05-17 11:15:58 +0100
commit84d79f62d8e96f14f6aca14fdace831b568bff50 (patch)
tree5f51b8d2a595708e0f842808c6cd11c6972e8884
parentf41749963b344bd5dd069bd610b68a9a2e24a51b (diff)
downloadrabbitmq-server-84d79f62d8e96f14f6aca14fdace831b568bff50.tar.gz
don't wait (nearly) forever for mirrored_supervisor migrations
...and reduce wait time for migrations we expect to fail, so we keep the overall run time short.
-rw-r--r--src/mirrored_supervisor_tests.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mirrored_supervisor_tests.erl b/src/mirrored_supervisor_tests.erl
index 47a101be..f8cbd853 100644
--- a/src/mirrored_supervisor_tests.erl
+++ b/src/mirrored_supervisor_tests.erl
@@ -157,7 +157,7 @@ test_no_migration_on_shutdown() ->
with_sups(fun([Evil, _]) ->
?MS:start_child(Evil, childspec(worker)),
try
- call(worker, ping, 10000, 100),
+ call(worker, ping, 1000, 100),
exit(worker_should_not_have_migrated)
catch exit:{timeout_waiting_for_server, _, _} ->
ok
@@ -268,7 +268,7 @@ inc_group() ->
get_group(Group) ->
{Group, get(counter)}.
-call(Id, Msg) -> call(Id, Msg, 5*24*60*60*1000, 100).
+call(Id, Msg) -> call(Id, Msg, 10*1000, 100).
call(Id, Msg, 0, _Decr) ->
exit({timeout_waiting_for_server, {Id, Msg}, erlang:get_stacktrace()});