diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-28 09:21:29 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-28 09:21:29 +0100 |
| commit | 4789aa5ab21e86e59fb0098938729d7cd46f385f (patch) | |
| tree | 8e6ccb997c8dc78b402785a567c10c239a5dffdd /lib | |
| parent | 72f4349d634a8bbf8de5a50ac4535eb8ee157b6c (diff) | |
| parent | c63fcce283f26306be890e7153f2941948eef0f8 (diff) | |
| download | otp-4789aa5ab21e86e59fb0098938729d7cd46f385f.tar.gz otp-4789aa5ab21e86e59fb0098938729d7cd46f385f.tar.bz2 otp-4789aa5ab21e86e59fb0098938729d7cd46f385f.zip | |
Merge branch 'ia/ssl/sslv2-tests'
* ia/ssl/sslv2-tests:
ssl: Receive port EXIT-message so that it does not get mixed up with the protocol-error message we are expecting
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 98ef050b14..f4e19b3f87 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1080,14 +1080,13 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) -> OpenSslPort = open_port({spawn, Cmd}, [stderr_to_stdout]), port_command(OpenSslPort, Data), - + receive + {'EXIT', OpenSslPort, _} -> + ok + + end, ssl_test_lib:check_result(Server, {error,"protocol version"}), - - %% Clean close down! Server needs to be closed first !! - ssl_test_lib:close(Server), - close_port(OpenSslPort), - process_flag(trap_exit, false), - ok. + process_flag(trap_exit, false). %%-------------------------------------------------------------------- erlang_client_openssl_server_npn(doc) -> |