From e92171a8f80755dad795691ad9e07807212d0d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Thu, 9 May 2019 10:18:53 +0200
Subject: Use ssl:handshake instead of ssl:ssl_accept

This makes Ranch require OTP-21+. The function ranch:accept_ack/1
was also removed in this commit.
---
 test/accept_ack_protocol.erl | 22 ----------------------
 test/acceptor_SUITE.erl      | 33 ---------------------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 test/accept_ack_protocol.erl

(limited to 'test')

diff --git a/test/accept_ack_protocol.erl b/test/accept_ack_protocol.erl
deleted file mode 100644
index 3c36fc7..0000000
--- a/test/accept_ack_protocol.erl
+++ /dev/null
@@ -1,22 +0,0 @@
--module(accept_ack_protocol).
--behaviour(ranch_protocol).
-
--export([start_link/4]).
--export([init/4]).
-
-start_link(Ref, Socket, Transport, Opts) ->
-	Pid = spawn_link(?MODULE, init, [Ref, Socket, Transport, Opts]),
-	{ok, Pid}.
-
-init(Ref, Socket, Transport, _Opts = []) ->
-	ok = ranch:accept_ack(Ref),
-	loop(Socket, Transport).
-
-loop(Socket, Transport) ->
-	case Transport:recv(Socket, 0, 5000) of
-		{ok, Data} ->
-			Transport:send(Socket, Data),
-			loop(Socket, Transport);
-		_ ->
-			ok = Transport:close(Socket)
-	end.
diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl
index 386bf68..0b59855 100644
--- a/test/acceptor_SUITE.erl
+++ b/test/acceptor_SUITE.erl
@@ -31,7 +31,6 @@ groups() ->
 		tcp_active_echo,
 		tcp_echo,
 		tcp_graceful,
-		tcp_accept_ack,
 		tcp_inherit_options,
 		tcp_max_connections,
 		tcp_max_connections_and_beyond,
@@ -49,7 +48,6 @@ groups() ->
 		ssl_active_echo,
 		ssl_echo,
 		ssl_graceful,
-		ssl_accept_ack,
 		ssl_sni_echo,
 		ssl_sni_fail,
 		ssl_upgrade_from_tcp,
@@ -543,22 +541,6 @@ ssl_graceful(_) ->
 	{'EXIT', _} = begin catch ranch:get_port(Name) end,
 	ok.
 
-ssl_accept_ack(_) ->
-	doc("Ensure accept_ack works with SSL transport."),
-	Name = name(),
-	Opts = ct_helper:get_certs_from_ets(),
-	{ok, _} = ranch:start_listener(Name,
-		ranch_ssl, Opts,
-		accept_ack_protocol, []),
-	Port = ranch:get_port(Name),
-	{ok, Socket} = ssl:connect("localhost", Port, [binary, {active, false}, {packet, raw}]),
-	ok = ssl:send(Socket, <<"SSL transport accept_ack is working!">>),
-	{ok, <<"SSL transport accept_ack is working!">>} = ssl:recv(Socket, 36, 1000),
-	ok = ranch:stop_listener(Name),
-	{error, closed} = ssl:recv(Socket, 0, 1000),
-	{'EXIT', _} = begin catch ranch:get_port(Name) end,
-	ok.
-
 ssl_getopts_capability(_) ->
 	doc("Ensure getopts/2 capability."),
 	Name=name(),
@@ -712,21 +694,6 @@ tcp_graceful(_) ->
 	{'EXIT', _} = begin catch ranch:get_port(Name) end,
 	ok.
 
-tcp_accept_ack(_) ->
-	doc("Ensure accept_ack works with TCP transport."),
-	Name = name(),
-	{ok, _} = ranch:start_listener(Name,
-		ranch_tcp, #{},
-		accept_ack_protocol, []),
-	Port = ranch:get_port(Name),
-	{ok, Socket} = gen_tcp:connect("localhost", Port, [binary, {active, false}, {packet, raw}]),
-	ok = gen_tcp:send(Socket, <<"TCP transport accept_ack is working!">>),
-	{ok, <<"TCP transport accept_ack is working!">>} = gen_tcp:recv(Socket, 36, 1000),
-	ok = ranch:stop_listener(Name),
-	{error, closed} = gen_tcp:recv(Socket, 0, 1000),
-	{'EXIT', _} = begin catch ranch:get_port(Name) end,
-	ok.
-
 tcp_inherit_options(_) ->
 	doc("Ensure TCP options are inherited in the protocol."),
 	Name = name(),
-- 
cgit v1.2.3