aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-01-25 10:45:03 +0100
committerIngela Anderton Andin <[email protected]>2013-01-25 10:45:03 +0100
commit7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962 (patch)
tree34fdad7a1d1f604ed94eb5d37a1385894892fe3f /lib/ssl/test
parentded09e07cdc5f899d4f550c62ad5dfe04aa32403 (diff)
parent7ec33606d7bdcf4a2a3627466be9f65b32366b82 (diff)
downloadotp-7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962.tar.gz
otp-7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962.tar.bz2
otp-7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962.zip
Merge branch 'ia/ssl/test-case-timeout'
* ia/ssl/test-case-timeout: ssl: Too short timeout in test case
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index df84acacdc..7067cd861d 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -2955,7 +2955,7 @@ erlang_ssl_receive(Socket, Data) ->
erlang_ssl_receive(Socket, tl(Data));
Other ->
ct:fail({unexpected_message, Other})
- after ?SLEEP * 3 ->
+ after ?SLEEP * 3 * test_server:timetrap_scale_factor() ->
ct:fail({did_not_get, Data})
end.