diff options
| author | Hans Nilsson <hans@erlang.org> | 2019-09-12 10:23:12 +0200 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2019-09-20 10:31:47 +0200 |
| commit | 003048b2856492d4c8124fd0696e3dd0ee1ab55b (patch) | |
| tree | 73a569c90b0183d9888bd368712af37427ec43c5 | |
| parent | 2837fbeb8f582cabce64123f29c2ef20b8b1e25c (diff) | |
| download | erlang-003048b2856492d4c8124fd0696e3dd0ee1ab55b.tar.gz | |
ssh: Extend sshc supervisor test with expecting ssh_tcpip_forward_acceptor_sup
| -rw-r--r-- | lib/ssh/test/ssh_sup_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl index 554fb63ad8..0f60d0ef79 100644 --- a/lib/ssh/test/ssh_sup_SUITE.erl +++ b/lib/ssh/test/ssh_sup_SUITE.erl @@ -411,17 +411,20 @@ check_sshc_system_tree(SysSup, Connection, LocalIP, LocalPort, _Config) -> ?wait_match([{_,SubSysSup,supervisor,[ssh_subsystem_sup]}], supervisor:which_children(SysSup), [SubSysSup]), - ?wait_match([{{client,ssh_connection_sup, LocalIP, LocalPort}, + ?wait_match([{_,FwdAccSup, supervisor, + [ssh_tcpip_forward_acceptor_sup]}, + {{client,ssh_connection_sup, LocalIP, LocalPort}, ConnectionSup, supervisor, [ssh_connection_sup]}, {{client,ssh_channel_sup, LocalIP, LocalPort}, ChannelSup,supervisor, [ssh_channel_sup]}], supervisor:which_children(SubSysSup), - [ConnectionSup,ChannelSup]), + [ConnectionSup,ChannelSup,FwdAccSup]), ?wait_match([{_, Connection, worker,[ssh_connection_handler]}], supervisor:which_children(ConnectionSup)), ?wait_match([], supervisor:which_children(ChannelSup)), + ?wait_match([], supervisor:which_children(FwdAccSup)), {ok,ChPid1} = ssh_sftp:start_channel(Connection), ?wait_match([{_,ChPid1,worker,[ssh_client_channel]}], |