aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-05-07 09:46:16 +0200
committerIngela Anderton Andin <[email protected]>2015-05-07 09:46:16 +0200
commit33e6eb686d212c219a3bbc34e853e46433c5cba1 (patch)
tree35cd93ac0d21f47fc89b2a3b07a217e44a32ab5e
parent042e0095843ab229734fb288ecaf70d486659f92 (diff)
parent7d53cdb5dabeea6c51e56703667ed6879ad29542 (diff)
downloadotp-33e6eb686d212c219a3bbc34e853e46433c5cba1.tar.gz
otp-33e6eb686d212c219a3bbc34e853e46433c5cba1.tar.bz2
otp-33e6eb686d212c219a3bbc34e853e46433c5cba1.zip
Merge branch 'ia/ssh/extra-logout'
* ia/ssh/extra-logout: ssh: Hadle shell that sends two logout messages
-rw-r--r--lib/ssh/test/ssh_to_openssh_SUITE.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index d99123f871..a61fd2dd41 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -545,6 +545,7 @@ receive_hej() ->
receive_logout() ->
receive
<<"logout">> ->
+ extra_logout(),
receive
<<"Connection closed">> ->
ok
@@ -564,6 +565,14 @@ receive_normal_exit(Shell) ->
ct:fail({unexpected_msg, Other})
end.
+extra_logout() ->
+ receive
+ <<"logout">> ->
+ ok
+ after 500 ->
+ ok
+ end.
+
%%--------------------------------------------------------------------
%%--------------------------------------------------------------------
%% Check if we have a "newer" ssh client that supports these test cases