aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_trpt_test_lib.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-07-03 13:17:40 +0200
committerHans Nilsson <[email protected]>2015-07-03 13:17:40 +0200
commitcbdc82ba5fdfeaee255f5f16e0d8c0e840cef3d8 (patch)
treebe5a0c5a0cff310466025e082e95affccd8fbb10 /lib/ssh/test/ssh_trpt_test_lib.erl
parenta7fb15f611d54994fcc210550b522d49c1fb22d7 (diff)
parenta9bedfb5b9a469642c0e8bf315f41a2505444cd6 (diff)
downloadotp-cbdc82ba5fdfeaee255f5f16e0d8c0e840cef3d8.tar.gz
otp-cbdc82ba5fdfeaee255f5f16e0d8c0e840cef3d8.tar.bz2
otp-cbdc82ba5fdfeaee255f5f16e0d8c0e840cef3d8.zip
Merge branch 'hans/ssh/no_common_algs/OTP-11531' into maint
* hans/ssh/no_common_algs/OTP-11531: ssh: testcases for no common algorithms in key exchange
Diffstat (limited to 'lib/ssh/test/ssh_trpt_test_lib.erl')
-rw-r--r--lib/ssh/test/ssh_trpt_test_lib.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_trpt_test_lib.erl b/lib/ssh/test/ssh_trpt_test_lib.erl
index 8623020a31..a604fca1ac 100644
--- a/lib/ssh/test/ssh_trpt_test_lib.erl
+++ b/lib/ssh/test/ssh_trpt_test_lib.erl
@@ -200,7 +200,9 @@ op_val(E, S0) ->
{'EXIT',{function_clause,[{ssh_trpt_test_lib,op,[E,S0],_}|_]}} ->
{instantiate(E,S0), S0};
S=#s{} ->
- {S#s.return_value, S}
+ {S#s.return_value, S};
+ F={fail,receive_timeout,_St} ->
+ throw(F)
end.