diff options
| author | Hans Nilsson <[email protected]> | 2017-11-20 12:10:18 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-11-20 12:10:18 +0100 |
| commit | fbc24513ab2d241d912225d067b72e517742e698 (patch) | |
| tree | 9681f34f10af325198018e2db74ab6a77ce977cb /lib/ssh/test/ssh_options_SUITE.erl | |
| parent | 8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4 (diff) | |
| parent | bab7b1aba04209c90d15be7147cc3524ae6964f5 (diff) | |
| download | otp-fbc24513ab2d241d912225d067b72e517742e698.tar.gz otp-fbc24513ab2d241d912225d067b72e517742e698.tar.bz2 otp-fbc24513ab2d241d912225d067b72e517742e698.zip | |
Merge branch 'maint'
* maint:
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:
OTP_VERSION
Diffstat (limited to 'lib/ssh/test/ssh_options_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_options_SUITE.erl | 2 |
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). %%-------------------------------------------------------------------- |