diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-23 10:08:51 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-23 10:08:51 +0200 |
| commit | 7cff27e14e051b6ee15f564335eb8e685e1639c1 (patch) | |
| tree | b97f48f3482bd7f0651acdaab4eba69709a8c88f /lib/ssl/test/ssl_cipher_SUITE.erl | |
| parent | c57c5c83acb3a21b52304bc53cbdf32e0dda3690 (diff) | |
| parent | 566cbee917638f596c5d46bd0aff331a66f5c8d2 (diff) | |
| download | otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.gz otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.bz2 otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.zip | |
Merge branch 'ia/ssl/modern-timetrap'
* ia/ssl/modern-timetrap:
ssl: Make init functions fail if make_certs:all fails
ssl: Avoid sleep
ssl: modernize timetrap handling
Diffstat (limited to 'lib/ssl/test/ssl_cipher_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_cipher_SUITE.erl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_cipher_SUITE.erl b/lib/ssl/test/ssl_cipher_SUITE.erl index 3c7102bd41..b8096c5d7a 100644 --- a/lib/ssl/test/ssl_cipher_SUITE.erl +++ b/lib/ssl/test/ssl_cipher_SUITE.erl @@ -30,8 +30,6 @@ -include("ssl_cipher.hrl"). -include("ssl_alert.hrl"). --define(TIMEOUT, 600000). - %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- @@ -59,10 +57,9 @@ init_per_group(_GroupName, Config) -> end_per_group(_GroupName, Config) -> Config. -init_per_testcase(_TestCase, Config0) -> - Config = lists:keydelete(watchdog, 1, Config0), - Dog = ct:timetrap(?TIMEOUT), - [{watchdog, Dog} | Config]. +init_per_testcase(_TestCase, Config) -> + ct:timetrap({seconds, 5}), + Config. end_per_testcase(_TestCase, Config) -> Config. @@ -106,7 +103,7 @@ padding_test(Config) when is_list(Config) -> % Internal functions -------------------------------------------------------- %%-------------------------------------------------------------------- decipher_check_good(HashSz, CipherState, Version) -> - {Content, NextIV, Mac} = content_nextiv_mac(Version), + {Content, _NextIV, Mac} = content_nextiv_mac(Version), {Content, Mac, _} = ssl_cipher:decipher(?AES_CBC, HashSz, CipherState, aes_fragment(Version), Version, true). |