diff options
| author | Hans Nilsson <[email protected]> | 2015-10-20 14:11:24 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-20 14:11:24 +0200 |
| commit | 6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a (patch) | |
| tree | c2a93e5788edc1ab167a89d4b043b07a66ad47f5 /lib/ssh/test/ssh_connection_SUITE.erl | |
| parent | 5ea9a240688f43f81eb607d79e4161f9085024e7 (diff) | |
| parent | 51d3c765b0a681794e364921bce32da8ee0624c0 (diff) | |
| download | otp-6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a.tar.gz otp-6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a.tar.bz2 otp-6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a.zip | |
Merge branch 'maint'
* maint:
ssh: Removed testcases from ssh_to_openssh_SUITE
ssh: test suites probes ssh client
ssh: running ssh_algorithms_SUITE tests in parallel
ssh: wait for subsystem exit in ssh_connection_SUITE:max_channels_option
Diffstat (limited to 'lib/ssh/test/ssh_connection_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_connection_SUITE.erl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl index f0fdf5c0cc..1b93cc9c32 100644 --- a/lib/ssh/test/ssh_connection_SUITE.erl +++ b/lib/ssh/test/ssh_connection_SUITE.erl @@ -700,6 +700,16 @@ max_channels_option(Config) when is_list(Config) -> %%%---- close the shell ok = ssh_connection:send(ConnectionRef, ChannelId0, "exit().\n", 5000), + %%%---- wait for the subsystem to terminate + receive + {ssh_cm,ConnectionRef,{closed,ChannelId0}} -> ok + after 5000 -> + ct:log("Timeout waiting for '{ssh_cm,~p,{closed,~p}}'~n" + "Message queue:~n~p", + [ConnectionRef,ChannelId0,erlang:process_info(self(),messages)]), + ct:fail("exit Timeout",[]) + end, + %%%---- exec #3 success = ssh_connection:exec(ConnectionRef, ChannelId5, "testing3.\n", infinity), receive |