diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-04-07 13:07:02 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-07 13:07:02 +0000 |
| commit | 1e321a79bc71c5f647d407a9724e17d2856d22f0 (patch) | |
| tree | 49e53aebbc8729c184eddd4c7f57806d0bc9b773 | |
| parent | 1303d1a82206773c85a8d5bc734f3659ff12c078 (diff) | |
| download | otp-1e321a79bc71c5f647d407a9724e17d2856d22f0.tar.gz otp-1e321a79bc71c5f647d407a9724e17d2856d22f0.tar.bz2 otp-1e321a79bc71c5f647d407a9724e17d2856d22f0.zip | |
Generalized tcp_connect test
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 30a721b0b5..d1ee2ed77f 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -860,7 +860,7 @@ tcp_connect(Config) when is_list(Config) -> Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, {from, self()}, {timeout, 5000}, - {mfa, {?MODULE, should_close, []}}, + {mfa, {?MODULE, dummy, []}}, {tcp_options, TcpOpts}, {ssl_options, ServerOpts}]), Port = ssl_test_lib:inet_port(Server), @@ -869,18 +869,20 @@ tcp_connect(Config) when is_list(Config) -> test_server:format("Testcase ~p connected to Server ~p ~n", [self(), Server]), gen_tcp:send(Socket, "<SOME GARBLED NON SSL MESSAGE>"), - ssl_test_lib:check_result(Server, {error,esslerrssl}, tcp_closed, Socket), - + receive + {tcp_closed, Socket} -> + receive + {Server, {error, Error}} -> + test_server:format("Error ~p", [Error]) + end + end, ssl_test_lib:close(Server). -should_close(Socket) -> - receive - {ssl, Socket, closed} -> - server_closed; - Other -> - exit({?LINE, Other}) - end. +dummy(Socket) -> + %% Should not happen as the ssl connection will not be established + %% due to fatal handshake failiure + exit(kill). %%-------------------------------------------------------------------- ipv6(doc) -> |