From b986eae8289e2c5c485397bcd4abe89ef51ebd9a Mon Sep 17 00:00:00 2001
From: juhlig <j.uhlig@mailingwork.de>
Date: Thu, 6 Jun 2019 14:06:07 +0200
Subject: Remove pre-21 ssl version switches from tests

---
 test/acceptor_SUITE.erl | 34 ++++++----------------------------
 test/ranch_ct_hook.erl  |  4 +++-
 2 files changed, 9 insertions(+), 29 deletions(-)

(limited to 'test')

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
-- 
cgit v1.2.3