diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-09-07 11:29:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-09-07 11:29:02 +0200 |
| commit | 6d1e2c8980f01c89e5e6b4806fa0e7efedd33a87 (patch) | |
| tree | 34f8907b5a7c19c15b930289e7fd5eaef074b0d7 | |
| parent | 5900bd977164eba24311bbf9995a4e313d4013a7 (diff) | |
| parent | 4fb77b3ed94a3ecb9b6ebf95727408443542c993 (diff) | |
| download | otp-6d1e2c8980f01c89e5e6b4806fa0e7efedd33a87.tar.gz otp-6d1e2c8980f01c89e5e6b4806fa0e7efedd33a87.tar.bz2 otp-6d1e2c8980f01c89e5e6b4806fa0e7efedd33a87.zip | |
Merge branch 'ingela/ssl/clean-test-fix' into maint
* ingela/ssl/clean-test-fix:
ssl: Make sure test initilization is clean
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 6 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_certificate_verify_SUITE.erl | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 2bbb03a854..9efde4752f 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -276,6 +276,12 @@ end_per_suite(_Config) -> application:stop(crypto). %%-------------------------------------------------------------------- + +init_per_group(GroupName, Config) when GroupName == basic_tls; + GroupName == options_tls; + GroupName == basic; + GroupName == options -> + ssl_test_lib:clean_tls_version(Config); init_per_group(GroupName, Config) -> case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of true -> diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl index 6221cffdc1..c3fd73bf09 100644 --- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl +++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl @@ -110,8 +110,8 @@ init_per_group(tls, Config0) -> application:load(ssl), application:set_env(ssl, protocol_version, Version), ssl:start(), - Config = proplists:delete(protocol, Config0), - [{protocol, tls}, {version, tls_record:protocol_version(Version)} | Config]; + Config = ssl_test_lib:init_tls_version(Version, Config0), + [{version, tls_record:protocol_version(Version)} | Config]; init_per_group(dtls, Config0) -> Version = dtls_record:protocol_version(dtls_record:highest_protocol_version([])), @@ -119,8 +119,8 @@ init_per_group(dtls, Config0) -> application:load(ssl), application:set_env(ssl, protocol_version, Version), ssl:start(), - Config = proplists:delete(protocol_opts, proplists:delete(protocol, Config0)), - [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]}, {version, dtls_record:protocol_version(Version)} | Config]; + Config = ssl_test_lib:init_tls_version(Version, Config0), + [{version, dtls_record:protocol_version(Version)} | Config]; init_per_group(active, Config) -> [{active, true}, {receive_function, send_recv_result_active} | Config]; @@ -134,6 +134,9 @@ init_per_group(error_handling, Config) -> init_per_group(_, Config) -> Config. +end_per_group(GroupName, Config) when GroupName == tls; + GroupName == dtls -> + ssl_test_lib:clean_tls_version(Config); end_per_group(_GroupName, Config) -> Config. |