diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2011-12-01 17:47:58 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2011-12-01 17:47:58 +0000 |
commit | bf479646c91f5dec92d858d02a6b0f97f2cbef17 (patch) | |
tree | 3ce0017a10bf0bdf51ddb656c01952fd34ce9502 | |
parent | cf5f08b4db5455ca2dba6a590643fd7c84f59fb4 (diff) | |
download | rabbitmq-server-bf479646c91f5dec92d858d02a6b0f97f2cbef17.tar.gz |
Slightly clearer.
-rw-r--r-- | src/mirrored_supervisor_tests.erl | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mirrored_supervisor_tests.erl b/src/mirrored_supervisor_tests.erl index 6c2b1236..f2ae7e4e 100644 --- a/src/mirrored_supervisor_tests.erl +++ b/src/mirrored_supervisor_tests.erl @@ -199,7 +199,7 @@ test_ignore() -> passed. test_startup_failure() -> - [test_startup_failure(F) || F <- [error, exit]], + [test_startup_failure(F) || F <- [want_error, want_exit]], passed. test_startup_failure(Fail) -> @@ -247,11 +247,11 @@ start_sup0(Name, Group, ChildSpecs) -> childspec(Id) -> {Id, {?MODULE, start_gs, [Id]}, transient, 16#ffffffff, worker, [?MODULE]}. -start_gs(error) -> +start_gs(want_error) -> {error, foo}; -start_gs(exit) -> - {exit, foo}; +start_gs(want_exit) -> + exit(foo); start_gs(Id) -> gen_server:start_link({local, Id}, ?MODULE, server, []). @@ -304,12 +304,6 @@ kill_wait(Pid) -> init({sup, fake_strategy_for_ignore, _ChildSpecs}) -> ignore; -init({sup, fake_strategy_for_startup_error, _ChildSpecs}) -> - {error, foo}; - -init({sup, fake_strategy_for_startup_exit, _ChildSpecs}) -> - exit(foo); - init({sup, Strategy, ChildSpecs}) -> {ok, {{Strategy, 0, 1}, ChildSpecs}}; |