diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-17 16:47:06 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-22 16:02:57 +0200 |
| commit | 287ab39e946b4578d755038989ad50ccfb95f575 (patch) | |
| tree | 71e45c64337a001f7674b308fd20e101d8d49d1b /lib/ssl/test/ssl_cipher_SUITE.erl | |
| parent | 2be7b33f26fc950c2f807e1f9fbc19fde83facd0 (diff) | |
| download | otp-287ab39e946b4578d755038989ad50ccfb95f575.tar.gz otp-287ab39e946b4578d755038989ad50ccfb95f575.tar.bz2 otp-287ab39e946b4578d755038989ad50ccfb95f575.zip | |
ssl: modernize timetrap handling
Watchdog is legacy test_server use only ct:timetrap/1
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 4cf80e1f43..fe83b85dbc 100644 --- a/lib/ssl/test/ssl_cipher_SUITE.erl +++ b/lib/ssl/test/ssl_cipher_SUITE.erl @@ -29,8 +29,6 @@ -include("ssl_cipher.hrl"). -include("ssl_alert.hrl"). --define(TIMEOUT, 600000). - %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- @@ -58,10 +56,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. @@ -105,7 +102,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). |