diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-05 10:03:12 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-05 10:03:12 +0100 |
| commit | e495e67ad8f2c474a94795a3f54b0e13b54e5235 (patch) | |
| tree | 2e15724d608a1d9733ba8d9c3dc2fed3676944b3 /src/test_sup.erl | |
| parent | 045f3c7c6ba0933f65d36a8d06a9a5ca0c7e93f7 (diff) | |
| parent | 51c8e02239abcb2f8a9a80db8ed2385e0ce67d10 (diff) | |
| download | rabbitmq-server-e495e67ad8f2c474a94795a3f54b0e13b54e5235.tar.gz | |
merge default into bug23056
Diffstat (limited to 'src/test_sup.erl')
| -rw-r--r-- | src/test_sup.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test_sup.erl b/src/test_sup.erl index 8413e6bf..5feb146f 100644 --- a/src/test_sup.erl +++ b/src/test_sup.erl @@ -45,10 +45,10 @@ test_supervisor_delayed_restart() -> test_supervisor_delayed_restart(SupPid) -> ok = ping_child(SupPid), ok = exit_child(SupPid), - timer:sleep(10), + timer:sleep(100), ok = ping_child(SupPid), ok = exit_child(SupPid), - timer:sleep(10), + timer:sleep(100), timeout = ping_child(SupPid), timer:sleep(1010), ok = ping_child(SupPid), @@ -57,8 +57,8 @@ test_supervisor_delayed_restart(SupPid) -> with_sup(RestartStrategy, Fun) -> {ok, SupPid} = supervisor2:start_link(?MODULE, [RestartStrategy]), Res = Fun(SupPid), + unlink(SupPid), exit(SupPid, shutdown), - rabbit_misc:unlink_and_capture_exit(SupPid), Res. init([RestartStrategy]) -> |