aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-07-04 10:50:22 +0200
committerHans Nilsson <[email protected]>2015-07-04 11:00:54 +0200
commit9931cad6d5f653a8be2bb324450c1d4b2c5637cf (patch)
tree91f489c0a8ba1ba6f30396809636020090fa8f06 /lib/ssh
parente0694680a8b59641369a478b1aec58c2c2acc5d4 (diff)
downloadotp-9931cad6d5f653a8be2bb324450c1d4b2c5637cf.tar.gz
otp-9931cad6d5f653a8be2bb324450c1d4b2c5637cf.tar.bz2
otp-9931cad6d5f653a8be2bb324450c1d4b2c5637cf.zip
ssh: be more generous about disconnect expects
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/test/ssh_protocol_SUITE.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 58c8306c31..d82cdaf2c7 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -226,7 +226,8 @@ no_common_alg_server_disconnects(Config) ->
{match, #ssh_msg_kexinit{_='_'}, receive_msg},
{send, ssh_msg_kexinit},
{match,
- #ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED, _='_'},
+ {'or',[#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED, _='_'},
+ tcp_closed]},
receive_msg}
]
).
@@ -269,10 +270,10 @@ no_common_alg_client_disconnects(Config) ->
first_kex_packet_follows = false,
reserved = 0
}},
-
- {match,
- #ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED, _='_'},
- receive_msg}
+ {match,
+ {'or',[#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED, _='_'},
+ tcp_closed]},
+ receive_msg}
],
InitialState)
}