diff options
| author | juhlig <[email protected]> | 2019-06-06 14:06:07 +0200 |
|---|---|---|
| committer | juhlig <[email protected]> | 2019-06-06 14:06:07 +0200 |
| commit | b986eae8289e2c5c485397bcd4abe89ef51ebd9a (patch) | |
| tree | 7233fc83d8d2ae56da9ea4eb6969b166bd974503 /test | |
| parent | 55d56a1108a92b53633629b76458e830fcc99e35 (diff) | |
| download | ranch-b986eae8289e2c5c485397bcd4abe89ef51ebd9a.tar.gz ranch-b986eae8289e2c5c485397bcd4abe89ef51ebd9a.tar.bz2 ranch-b986eae8289e2c5c485397bcd4abe89ef51ebd9a.zip | |
Remove pre-21 ssl version switches from tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/acceptor_SUITE.erl | 34 | ||||
| -rw-r--r-- | test/ranch_ct_hook.erl | 4 |
2 files changed, 9 insertions, 29 deletions
diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl index c7d7a00..3e65830 100644 --- a/test/acceptor_SUITE.erl +++ b/test/acceptor_SUITE.erl @@ -472,10 +472,12 @@ ssl_active_echo(_) -> ssl_active_n_echo(_) -> case application:get_key(ssl, vsn) of - {ok, Vsn} when Vsn >= "9.2" -> - do_ssl_active_n_echo(); - _ -> - {skip, "No Active N support."} + {ok, "9.0"++_} -> + {skip, "No Active N support."}; + {ok, "9.1"++_} -> + {skip, "No Active N support."}; + {ok, _} -> + do_ssl_active_n_echo() end. do_ssl_active_n_echo() -> @@ -548,14 +550,6 @@ do_ssl_local_echo() -> end. ssl_sni_echo(_) -> - case application:get_key(ssl, vsn) of - {ok, Vsn} when Vsn >= "7.0" -> - do_ssl_sni_echo(); - _ -> - {skip, "No SNI support."} - end. - -do_ssl_sni_echo() -> doc("Ensure that SNI works with SSL transport."), Name = name(), Opts = ct_helper:get_certs_from_ets(), @@ -573,14 +567,6 @@ do_ssl_sni_echo() -> ok. ssl_sni_fail(_) -> - case application:get_key(ssl, vsn) of - {ok, Vsn} when Vsn >= "7.0" -> - do_ssl_sni_fail(); - _ -> - {skip, "No SNI support."} - end. - -do_ssl_sni_fail() -> doc("Ensure that connection fails when host is not in SNI list."), Name = name(), Opts = ct_helper:get_certs_from_ets(), @@ -672,14 +658,6 @@ ssl_getopts_capability(_) -> ok. ssl_getstat_capability(_) -> - case application:get_key(ssl, vsn) of - {ok, Vsn} when Vsn>="8.0" -> - do_ssl_getstat_capability(); - _ -> - {skip, "No getstat/1,2 support."} - end. - -do_ssl_getstat_capability() -> doc("Ensure getstat/1,2 capability."), Name=name(), Opts=ct_helper:get_certs_from_ets(), diff --git a/test/ranch_ct_hook.erl b/test/ranch_ct_hook.erl index 54bef27..70c1b1b 100644 --- a/test/ranch_ct_hook.erl +++ b/test/ranch_ct_hook.erl @@ -28,7 +28,9 @@ init(_, _) -> %% OTP 21.2/ssl 9.1. %% @todo Put an upper limit on the version when %% this is fixed in a future OTP version. - {{win32, nt}, {ok, Vsn}} when Vsn >= "9.1" -> + {_, {ok, "9.0"++_}} -> + ok; + {{win32, nt}, {ok, "9."++_}} -> application:set_env(ssl, internal_active_n, 1); _ -> ok |