diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-05-22 09:42:23 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-05-22 09:42:23 +0200 |
| commit | cfb049920057b7cf93582f6d222156c93ca07db7 (patch) | |
| tree | ee3085eab0553df90f4113c45159ea77a0b1f6c2 /lib/ssl/test/ssl_npn_handshake_SUITE.erl | |
| parent | 709390cb5426d12b0651f134dce7232006a7c3c8 (diff) | |
| parent | 718a7553c0f41971b1b6e5d7886851adb550b3b2 (diff) | |
| download | otp-cfb049920057b7cf93582f6d222156c93ca07db7.tar.gz otp-cfb049920057b7cf93582f6d222156c93ca07db7.tar.bz2 otp-cfb049920057b7cf93582f6d222156c93ca07db7.zip | |
Merge branch 'ia/ssl/SNI-cuddle'
* ia/ssl/SNI-cuddle:
ssl: Make test case timing independent
ssl: Use new API function connection_information in tests
ssl: Increase readability
ssl: Add cleanup to tests
Diffstat (limited to 'lib/ssl/test/ssl_npn_handshake_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_npn_handshake_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl index 326f907e66..8e95679306 100644 --- a/lib/ssl/test/ssl_npn_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_npn_handshake_SUITE.erl @@ -332,7 +332,7 @@ ssl_receive_and_assert_npn(Socket, Protocol, Data) -> ssl_send(Socket, Data) -> ct:log("Connection info: ~p~n", - [ssl:connection_info(Socket)]), + [ssl:connection_information(Socket)]), ssl:send(Socket, Data). ssl_receive(Socket, Data) -> @@ -340,7 +340,7 @@ ssl_receive(Socket, Data) -> ssl_receive(Socket, Data, Buffer) -> ct:log("Connection info: ~p~n", - [ssl:connection_info(Socket)]), + [ssl:connection_information(Socket)]), receive {ssl, Socket, MoreData} -> ct:log("Received ~p~n",[MoreData]), @@ -360,4 +360,4 @@ ssl_receive(Socket, Data, Buffer) -> connection_info_result(Socket) -> - ssl:connection_info(Socket). + ssl:connection_information(Socket). |