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_packet_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_packet_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_packet_SUITE.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl index b1e6adb5a7..08a66ec07a 100644 --- a/lib/ssl/test/ssl_packet_SUITE.erl +++ b/lib/ssl/test/ssl_packet_SUITE.erl @@ -38,7 +38,6 @@ -define(uint24(X), << ?UINT24(X) >> ). -define(uint32(X), << ?UINT32(X) >> ). -define(uint64(X), << ?UINT64(X) >> ). --define(TIMEOUT, 120000). -define(MANY, 1000). -define(SOME, 50). @@ -138,10 +137,8 @@ init_per_suite(Config) -> try crypto:start() of ok -> ssl:start(), - Result = - (catch make_certs:all(?config(data_dir, Config), - ?config(priv_dir, Config))), - ct:log("Make certs ~p~n", [Result]), + {ok, _} = make_certs:all(?config(data_dir, Config), + ?config(priv_dir, Config)), ssl_test_lib:cert_options(Config) catch _:_ -> {skip, "Crypto did not start"} @@ -170,10 +167,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, 15}), + Config. end_per_testcase(_TestCase, Config) -> |