summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-05-03 13:21:01 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-05-03 13:21:01 +0100
commitfecdf8e522bffd744be255d5f12ec808db0a0fa7 (patch)
treede9a02d85de5d2b6d56e3ee71575a05319226429
parent2d85d71d68bb1398a2538e14e7d43854996644e5 (diff)
downloadrabbitmq-server-fecdf8e522bffd744be255d5f12ec808db0a0fa7.tar.gz
Revert 9d59000c4a44, 38eb4652c7e3, f6d1609212f9, e1311dd42eba (timeout changes for mirrored_sup tests)
-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 776abb78..e8baabe8 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),
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, 1000, 100).
call(Id, Msg, 0, _Decr) ->
exit({timeout_waiting_for_server, {Id, Msg}, erlang:get_stacktrace()});