diff options
author | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:07:58 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:07:58 +0200 |
commit | 17f389d3d79e7c020431f3b6941cc301a977c5d8 (patch) | |
tree | a72a11c8af3f274ac82b5a5c65487ba70fee03fd /lib/ssl/test/ssl_session_cache_SUITE.erl | |
parent | d1e636f236a4a76e999ff516718c814f3eeed617 (diff) | |
parent | 98c0cbbe4cae890bbda6a1d297c9c161534adb6a (diff) | |
download | otp-17f389d3d79e7c020431f3b6941cc301a977c5d8.tar.gz otp-17f389d3d79e7c020431f3b6941cc301a977c5d8.tar.bz2 otp-17f389d3d79e7c020431f3b6941cc301a977c5d8.zip |
Merge branch 'ia/ssl/inet-getopts-crash/OTP-9382' into dev
* ia/ssl/inet-getopts-crash/OTP-9382:
Handle inet:getopts/2 and inet:setopts/2 crashes
Diffstat (limited to 'lib/ssl/test/ssl_session_cache_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 5d96b457ed..2c2d88db8f 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -221,7 +221,7 @@ session_cleanup(Config)when is_list(Config) -> %% Make sure session has expired and been cleaned up test_server:sleep(5000), %% Expire time - test_server:sleep((?SLEEP*20), %% Clean up delay (very small in this test case) + some extra time + test_server:sleep(?SLEEP*20), %% Clean up delay (very small in this test case) + some extra time undefined = ssl_session_cache:lookup(Cache, {{Hostname, Port}, Id}), undefined = ssl_session_cache:lookup(Cache, {Port, Id}), @@ -252,7 +252,6 @@ session_cache_process_mnesia(suite) -> session_cache_process_mnesia(Config) when is_list(Config) -> session_cache_process(mnesia,Config). - %%-------------------------------------------------------------------- %%% Session cache API callbacks %%-------------------------------------------------------------------- |