diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-22 14:21:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-22 14:21:24 +0200 |
| commit | f87936b28199e4ed6e67ff188996108776fbfb1f (patch) | |
| tree | cfce40adef4b37570acbec3d4c5d9a6caba2afc1 | |
| parent | d799aa95dcff2fc2602db2b98798e1bca21a3a35 (diff) | |
| download | otp-f87936b28199e4ed6e67ff188996108776fbfb1f.tar.gz otp-f87936b28199e4ed6e67ff188996108776fbfb1f.tar.bz2 otp-f87936b28199e4ed6e67ff188996108776fbfb1f.zip | |
ssl: Test suite adjustments
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index ea29fa8f35..93f7209aea 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -2119,7 +2119,7 @@ make_sure_expired(Host, Port, Id) -> #session{is_resumable = false} -> ok; _ -> - test_server:sleep(100), + test_server:sleep(?SLEEP), make_sure_expired(Host, Port, Id) end. diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 05ed325ae2..d446014f7b 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -106,7 +106,9 @@ init_per_testcase(TestCase, Config0) -> special_init(TestCase, Config) when TestCase == erlang_client_openssl_server_renegotiate; - TestCase == erlang_client_openssl_server_no_wrap_sequence_number -> + TestCase == erlang_client_openssl_server_no_wrap_sequence_number; + TestCase == erlang_server_openssl_client_no_wrap_sequence_number + -> check_sane_openssl_renegotaite(Config); special_init(ssl2_erlang_server_openssl_client, Config) -> |