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.
This commit is contained in:
Matthias Radestock 2012-05-17 11:15:58 +01:00
parent 01c6657cd1
commit f213e8a037
1 changed files with 2 additions and 2 deletions

View File

@ -157,7 +157,7 @@ test_no_migration_on_shutdown() ->
with_sups(fun([Evil, _]) -> with_sups(fun([Evil, _]) ->
?MS:start_child(Evil, childspec(worker)), ?MS:start_child(Evil, childspec(worker)),
try try
call(worker, ping, 10000, 100), call(worker, ping, 1000, 100),
exit(worker_should_not_have_migrated) exit(worker_should_not_have_migrated)
catch exit:{timeout_waiting_for_server, _, _} -> catch exit:{timeout_waiting_for_server, _, _} ->
ok ok
@ -268,7 +268,7 @@ inc_group() ->
get_group(Group) -> get_group(Group) ->
{Group, get(counter)}. {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) -> call(Id, Msg, 0, _Decr) ->
exit({timeout_waiting_for_server, {Id, Msg}, erlang:get_stacktrace()}); exit({timeout_waiting_for_server, {Id, Msg}, erlang:get_stacktrace()});