aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_options_SUITE.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-11-20 12:08:42 +0100
committerHans Nilsson <[email protected]>2017-11-20 12:08:42 +0100
commitbab7b1aba04209c90d15be7147cc3524ae6964f5 (patch)
tree4d9c7ac92c0bf65a9498d8255d4879e75e2fda2f /lib/ssh/test/ssh_options_SUITE.erl
parentf91898fc08c28195dd2e9cbfb15bfd91a5584550 (diff)
parentf021a71ad8ffd2d1f5548927944d2b08935511d1 (diff)
downloadotp-bab7b1aba04209c90d15be7147cc3524ae6964f5.tar.gz
otp-bab7b1aba04209c90d15be7147cc3524ae6964f5.tar.bz2
otp-bab7b1aba04209c90d15be7147cc3524ae6964f5.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: lib/ssh/test/ssh_options_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_options_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_options_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 1f1206527e..144ec7f8fd 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -1082,7 +1082,7 @@ id_string_own_string_server(Config) ->
%%--------------------------------------------------------------------
id_string_own_string_server_trail_space(Config) ->
{_Server, Host, Port} = ssh_test_lib:std_daemon(Config, [{id_string,"Olle "}]),
- {ok,S1}=gen_tcp:connect(Host,Port,[{active,false},{packet,line}]),
+ {ok,S1}=ssh_test_lib:gen_tcp_connect(Host,Port,[{active,false},{packet,line}]),
{ok,"SSH-2.0-Olle \r\n"} = gen_tcp:recv(S1, 0, 2000).
%%--------------------------------------------------------------------