diff options
author | Ingela Anderton Andin <[email protected]> | 2016-06-14 14:12:36 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-06-14 14:12:36 +0200 |
commit | 33c76504691a19dd0a8494079b5235475fc1d778 (patch) | |
tree | 5aea8e1724b1adc08ab822d7050f5884ac7f9d11 /lib/ssl | |
parent | 704ad32027d4a0b31deb9c61037679b1d0527caa (diff) | |
parent | 06b6168e27564be7b0a9f0fa808539485632406e (diff) | |
download | otp-33c76504691a19dd0a8494079b5235475fc1d778.tar.gz otp-33c76504691a19dd0a8494079b5235475fc1d778.tar.bz2 otp-33c76504691a19dd0a8494079b5235475fc1d778.zip |
Merge branch 'ingela/ssl_to_openssl_SUITE-timeouts'
* ingela/ssl_to_openssl_SUITE-timeouts:
ssl: Timeout tuning
Diffstat (limited to 'lib/ssl')
-rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index d9a4657a79..e1710bb2c4 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -169,7 +169,7 @@ init_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs; special_init(TestCase, Config); init_per_testcase(TestCase, Config) -> - ct:timetrap({seconds, 10}), + ct:timetrap({seconds, 20}), special_init(TestCase, Config). special_init(TestCase, Config) |