aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_sup_SUITE.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-27 10:31:01 +0200
committerHans Nilsson <[email protected]>2018-04-27 10:31:01 +0200
commit82ac72abf72c25fb092486e50ddac700bec17341 (patch)
tree06b0de823c66c64ade945049d30c5cbda854bd9f /lib/ssh/test/ssh_sup_SUITE.erl
parent56e88f364a32b471b03e2364c2eb84783642ad88 (diff)
parentc2ca477c85e0e88732f634ddfb01ac675a97dddb (diff)
downloadotp-82ac72abf72c25fb092486e50ddac700bec17341.tar.gz
otp-82ac72abf72c25fb092486e50ddac700bec17341.tar.bz2
otp-82ac72abf72c25fb092486e50ddac700bec17341.zip
Merge branch 'hans/ssh/channel_maintenance/OTP-15041'
* hans/ssh/channel_maintenance/OTP-15041: ssh: ssh_channel replaced by ssh_client_channel ssh: ssh_daemon_channel replaced by ssh_server_channel ssh: Use ssh_daemon_channel_sup and ssh_damon_channel ssh: Create doc for the ssh_daemon_channel behaviour
Diffstat (limited to 'lib/ssh/test/ssh_sup_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_sup_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index 4e7169d927..b81f66948d 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -290,7 +290,7 @@ shell_channel_tree(Config) ->
{ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
ok = ssh_connection:shell(ConnectionRef,ChannelId0),
- ?wait_match([{_, GroupPid,worker,[ssh_channel]}],
+ ?wait_match([{_, GroupPid,worker,[ssh_server_channel]}],
supervisor:which_children(ChannelSup),
[GroupPid]),
{links,GroupLinks} = erlang:process_info(GroupPid, links),
@@ -339,9 +339,9 @@ chk_empty_con_daemon(Daemon) ->
?wait_match([{{server,ssh_connection_sup, _,_},
ConnectionSup, supervisor,
[ssh_connection_sup]},
- {{server,ssh_channel_sup,_ ,_},
+ {{server,ssh_server_channel_sup,_ ,_},
ChannelSup,supervisor,
- [ssh_channel_sup]}],
+ [ssh_server_channel_sup]}],
supervisor:which_children(SubSysSup),
[ConnectionSup,ChannelSup]),
?wait_match([{{ssh_acceptor_sup,_,_,_},_,worker,[ssh_acceptor]}],
@@ -372,9 +372,9 @@ check_sshd_system_tree(Daemon, Config) ->
?wait_match([{{server,ssh_connection_sup, _,_},
ConnectionSup, supervisor,
[ssh_connection_sup]},
- {{server,ssh_channel_sup,_ ,_},
+ {{server,ssh_server_channel_sup,_ ,_},
ChannelSup,supervisor,
- [ssh_channel_sup]}],
+ [ssh_server_channel_sup]}],
supervisor:which_children(SubSysSup),
[ConnectionSup,ChannelSup]),
@@ -388,7 +388,7 @@ check_sshd_system_tree(Daemon, Config) ->
ssh_sftp:start_channel(Client),
- ?wait_match([{_, _,worker,[ssh_channel]}],
+ ?wait_match([{_, _,worker,[ssh_server_channel]}],
supervisor:which_children(ChannelSup)),
ssh:close(Client).