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 | 1303d1a82206773c85a8d5bc734f3659ff12c078 (patch) | |
| tree | e0a1d5b46bf582e6d31bf2caafd531c4ad3e6cbd /lib/ssl/test/ssl_test_lib.erl | |
| parent | c9a28867c74755a68c43ff8f683fbd8004d5c3ba (diff) | |
| download | otp-1303d1a82206773c85a8d5bc734f3659ff12c078.tar.gz otp-1303d1a82206773c85a8d5bc734f3659ff12c078.tar.bz2 otp-1303d1a82206773c85a8d5bc734f3659ff12c078.zip | |
** Empty commit message **
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index f985058cd7..ee799c50c8 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -448,9 +448,19 @@ trigger_renegotiate(Socket, _, 0, Id) -> test_server:sleep(1000), case ssl:session_info(Socket) of [{session_id, Id} | _ ] -> + %% If a warning alert is received + %% from openssl this may not be + %% an error! fail_session_not_renegotiated; - _ -> - ok + %% Tests that uses this function will no reuse + %% sessions so if we get a new session id the + %% renegotiation has seceded. + [{session_id, _} | _ ] -> + ok; + {error, closed} -> + fail_session_fatal_alert_during_renegotiation; + {error, timeout} -> + fail_timeout end; trigger_renegotiate(Socket, ErlData, N, Id) -> |