aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_trpt_test_lib.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-19 16:02:50 +0200
committerHans Nilsson <[email protected]>2015-10-19 17:47:15 +0200
commiteea90ecdce24c15d39e77849d51729fcc06b74f8 (patch)
tree00e9a67ae4a585ad14c932759dc2983e6698d848 /lib/ssh/test/ssh_trpt_test_lib.erl
parentc7cb718a480ae03fedb842bc999d516aee7870b3 (diff)
downloadotp-eea90ecdce24c15d39e77849d51729fcc06b74f8.tar.gz
otp-eea90ecdce24c15d39e77849d51729fcc06b74f8.tar.bz2
otp-eea90ecdce24c15d39e77849d51729fcc06b74f8.zip
ssh: test suites probes ssh client
Previously we called the ssh client with the -Q option to query about supported algorithms. Since old clients do not support this and at least one lies, we now set up a fake server at let the ssh client start negotiation instead. Much more robust hopefully.
Diffstat (limited to 'lib/ssh/test/ssh_trpt_test_lib.erl')
-rw-r--r--lib/ssh/test/ssh_trpt_test_lib.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_trpt_test_lib.erl b/lib/ssh/test/ssh_trpt_test_lib.erl
index 772e50df87..5080b33249 100644
--- a/lib/ssh/test/ssh_trpt_test_lib.erl
+++ b/lib/ssh/test/ssh_trpt_test_lib.erl
@@ -73,7 +73,10 @@ exec(Op, S0=#s{}) ->
op(Op, S1))
of
S = #s{} ->
- print_traces(S),
+ case proplists:get_value(silent,S#s.opts) of
+ true -> ok;
+ _ -> print_traces(S)
+ end,
{ok,S}
catch
{fail,Reason,Se} ->