diff options
| author | Siri Hansen <[email protected]> | 2017-03-06 08:52:34 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-03-06 08:52:34 +0100 |
| commit | ff965ce109ea10ec69bbac47b3a3f9b51c43f236 (patch) | |
| tree | f97628a75d7303ff334b2ca40bc43ca2103587a2 /lib/ssl | |
| parent | b14e556b334069ca60b1be1a1ed45374daf8e1fc (diff) | |
| parent | 0e0155410734e04556ceecb1222dd2ef956b4177 (diff) | |
| download | otp-ff965ce109ea10ec69bbac47b3a3f9b51c43f236.tar.gz otp-ff965ce109ea10ec69bbac47b3a3f9b51c43f236.tar.bz2 otp-ff965ce109ea10ec69bbac47b3a3f9b51c43f236.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_npn_hello_SUITE.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl index 69aeea10c5..0b1de1dc1c 100644 --- a/lib/ssl/test/ssl_npn_hello_SUITE.erl +++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl @@ -50,6 +50,10 @@ init_per_suite(Config) -> {skip, "Crypto did not start"} end. +end_per_suite(_Config) -> + %% This function is required since init_per_suite/1 exists. + ok. + init_per_testcase(_TestCase, Config) -> ssl_test_lib:ct_log_supported_protocol_versions(Config), ct:timetrap({seconds, 5}), |