diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-01 14:52:57 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-01 14:52:57 +0100 |
| commit | b4694639af2b15b31e2459bfdb0d5e73763289ef (patch) | |
| tree | 3f8ba65fad282f33ea72600339428540754d4386 /lib | |
| parent | b36fda8a209c9b16e9ee09c69af9e23a0aad87d5 (diff) | |
| parent | 8183fcfb059794823a8289456d68b20a80d9a1b4 (diff) | |
| download | otp-b4694639af2b15b31e2459bfdb0d5e73763289ef.tar.gz otp-b4694639af2b15b31e2459bfdb0d5e73763289ef.tar.bz2 otp-b4694639af2b15b31e2459bfdb0d5e73763289ef.zip | |
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index b5c6a1da49..fafd97f839 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -1194,12 +1194,12 @@ tcp_connect(Config) when is_list(Config) -> {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config), TcpOpts = [binary, {reuseaddr, true}], - Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, - {from, self()}, - {timeout, 5000}, - {mfa, {?MODULE, dummy, []}}, - {tcp_options, TcpOpts}, - {ssl_options, ServerOpts}]), + Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0}, + {from, self()}, + {timeout, 5000}, + {mfa, {?MODULE, dummy, []}}, + {tcp_options, TcpOpts}, + {ssl_options, ServerOpts}]), Port = ssl_test_lib:inet_port(Server), {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]), @@ -1222,12 +1222,12 @@ tcp_connect_big(Config) when is_list(Config) -> {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config), TcpOpts = [binary, {reuseaddr, true}], - Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, - {from, self()}, - {timeout, 5000}, - {mfa, {?MODULE, dummy, []}}, - {tcp_options, TcpOpts}, - {ssl_options, ServerOpts}]), + Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0}, + {from, self()}, + {timeout, 5000}, + {mfa, {?MODULE, dummy, []}}, + {tcp_options, TcpOpts}, + {ssl_options, ServerOpts}]), Port = ssl_test_lib:inet_port(Server), {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]), |