diff options
| author | Hans Nilsson <[email protected]> | 2016-05-02 10:38:22 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-05-02 15:03:46 +0200 |
| commit | b5dfe717cca9ae3d86af6112cedf1d0918a83027 (patch) | |
| tree | 686b91b9a509c5c587e31d40115a86c6b7b1a2ed | |
| parent | 41d5dacc152e7f4f4f3edf44c39d0c61d5dd48d4 (diff) | |
| download | otp-b5dfe717cca9ae3d86af6112cedf1d0918a83027.tar.gz otp-b5dfe717cca9ae3d86af6112cedf1d0918a83027.tar.bz2 otp-b5dfe717cca9ae3d86af6112cedf1d0918a83027.zip | |
ssh: Update the ssh_sup_SUITE test
Conflicts:
lib/ssh/test/ssh_sup_SUITE.erl
| -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)). |