diff options
| author | Hans Nilsson <[email protected]> | 2016-05-03 13:59:17 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-05-03 13:59:17 +0200 |
| commit | 54825baea574a20441acc40948527c74a524c4ff (patch) | |
| tree | 4df95b67606f00b11497a1834e98909b723dab68 | |
| parent | 23cd840a8f600eff92c7c7ac2c8e0d98c5b55454 (diff) | |
| parent | b5dfe717cca9ae3d86af6112cedf1d0918a83027 (diff) | |
| download | otp-54825baea574a20441acc40948527c74a524c4ff.tar.gz otp-54825baea574a20441acc40948527c74a524c4ff.tar.bz2 otp-54825baea574a20441acc40948527c74a524c4ff.zip | |
Merge branch 'hans/ssh/cuddle_tests'
| -rw-r--r-- | lib/ssh/test/ssh_sup_SUITE.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl index 2dc4263603..f8929b30ff 100644 --- a/lib/ssh/test/ssh_sup_SUITE.erl +++ b/lib/ssh/test/ssh_sup_SUITE.erl @@ -108,18 +108,19 @@ sshc_subtree(Config) when is_list(Config) -> {ok, Pid1} = ssh:connect(Host, Port, [{silently_accept_hosts, true}, {user_interaction, false}, {user, ?USER}, {password, ?PASSWD},{user_dir, UserDir}]), - ?wait_match([{_, _,supervisor,[ssh_connection_handler]}], + + ?wait_match([{_, _,worker,[ssh_connection_handler]}], supervisor:which_children(sshc_sup)), {ok, Pid2} = ssh:connect(Host, Port, [{silently_accept_hosts, true}, {user_interaction, false}, {user, ?USER}, {password, ?PASSWD}, {user_dir, UserDir}]), - ?wait_match([{_,_,supervisor,[ssh_connection_handler]}, - {_,_,supervisor,[ssh_connection_handler]}], + ?wait_match([{_,_,worker,[ssh_connection_handler]}, + {_,_,worker,[ssh_connection_handler]}], supervisor:which_children(sshc_sup)), ssh:close(Pid1), - ?wait_match([{_,_,supervisor,[ssh_connection_handler]}], + ?wait_match([{_,_,worker,[ssh_connection_handler]}], supervisor:which_children(sshc_sup)), ssh:close(Pid2), ?wait_match([], supervisor:which_children(sshc_sup)). |