diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-12-01 16:21:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-12-01 16:21:52 +0100 |
| commit | 6971b9618b629014127c1e6d0a12343dbe864f58 (patch) | |
| tree | 0421dd4bc1a91cd2a6d13ab08e19e4d5901fe3e1 /lib | |
| parent | 4c96e3c0177fb9321808bffdf445f2c07a9fe36c (diff) | |
| parent | 9d02b4e06c695b5c4943710f4825133855ed4e0d (diff) | |
| download | otp-6971b9618b629014127c1e6d0a12343dbe864f58.tar.gz otp-6971b9618b629014127c1e6d0a12343dbe864f58.tar.bz2 otp-6971b9618b629014127c1e6d0a12343dbe864f58.zip | |
Merge branch 'ia/ssl/test-case-maint'
* ia/ssl/test-case-maint:
Test cases where failing due to timing issues in test case code
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_session_cache_SUITE.erl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 228ec9e294..ad01fddc68 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -2423,8 +2423,8 @@ server_verify_client_once_active_once(Config) when is_list(Config) -> {options, [{active, once} | ClientOpts]}]), ssl_test_lib:check_result(Server, ok, Client0, ok), - ssl_test_lib:close(Client0), Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}}, + ssl_test_lib:close(Client0), Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, {host, Hostname}, {from, self()}, diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl index 9c4a5ce640..7f782233ef 100644 --- a/lib/ssl/test/ssl_session_cache_SUITE.erl +++ b/lib/ssl/test/ssl_session_cache_SUITE.erl @@ -242,6 +242,8 @@ check_timer(Timer) -> case erlang:read_timer(Timer) of false -> {status, _, _, _} = sys:get_status(whereis(ssl_manager)), + timer:sleep(?SLEEP), + {status, _, _, _} = sys:get_status(whereis(ssl_manager)), ok; Int -> test_server:sleep(Int), |