summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-12-01 17:47:58 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-12-01 17:47:58 +0000
commitffd0e8891e3a8cd3af907163613b59958cbe0a31 (patch)
tree3ce0017a10bf0bdf51ddb656c01952fd34ce9502
parentef12656199d0d37d1d0d1159f71d4d4fb1c9123d (diff)
downloadrabbitmq-server-git-ffd0e8891e3a8cd3af907163613b59958cbe0a31.tar.gz
Slightly clearer.
-rw-r--r--src/mirrored_supervisor_tests.erl14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mirrored_supervisor_tests.erl b/src/mirrored_supervisor_tests.erl
index 6c2b123613..f2ae7e4eea 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}};