diff options
author | Ingela Anderton Andin <[email protected]> | 2011-11-28 12:32:10 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-11-28 12:32:10 +0100 |
commit | 4fee3925d969a42088af74dd02a791bb8e27fd9b (patch) | |
tree | ac4d183008552399237791ec6775e6da4697cd68 /lib/ssl/test/ssl_session_cache_SUITE.erl | |
parent | 2476bd42354b28a795a2b66401ca448d4f2b4ba0 (diff) | |
parent | 3fa6cba1cf509fbfc3ebbdd5bdb6ead153e5633b (diff) | |
download | otp-4fee3925d969a42088af74dd02a791bb8e27fd9b.tar.gz otp-4fee3925d969a42088af74dd02a791bb8e27fd9b.tar.bz2 otp-4fee3925d969a42088af74dd02a791bb8e27fd9b.zip |
Merge branch 'ia/ssl/tcp-error-handling/OTP-9734'
* ia/ssl/tcp-error-handling/OTP-9734:
Send ssl_closed notification to active ssl user when a tcp error occurs
Diffstat (limited to 'lib/ssl/test/ssl_session_cache_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 8cdfdec2ce..9c4a5ce640 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -210,7 +210,7 @@ session_cleanup(Config)when is_list(Config) -> {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)), [_, _,_, _, Prop] = StatusInfo, - State = state(Prop), + State = ssl_test_lib:state(Prop), Cache = element(2, State), SessionTimer = element(6, State), @@ -238,11 +238,6 @@ session_cleanup(Config)when is_list(Config) -> ssl_test_lib:close(Server), ssl_test_lib:close(Client). -state([{data,[{"State", State}]} | _]) -> - State; -state([_ | Rest]) -> - state(Rest). - check_timer(Timer) -> case erlang:read_timer(Timer) of false -> @@ -256,7 +251,7 @@ check_timer(Timer) -> get_delay_timer() -> {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)), [_, _,_, _, Prop] = StatusInfo, - State = state(Prop), + State = ssl_test_lib:state(Prop), case element(7, State) of undefined -> test_server:sleep(?SLEEP), |