From 980342f73c381413a09fbea94b43428e0f16d787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Sat, 26 Apr 2014 13:46:55 +0200
Subject: Make loop handlers work with SPDY

Adds a loop_handler test suite that runs all tests under HTTP, HTTPS,
SPDY each with and without the compress option enabled.

Fixes output filtering that used to filter more than it should have.
This forces us to parse the string sent by the emulator, which means
it's probably not perfect yet. But it should at least not hide errors
we want to see.

Fix a crash in the output filtering code that entirely disabled
output. Now when there is a crash the normal tty output is restored.

Handlers are now in test/handlers/ as they can be reused between
suites.

Only generate a single certificate for the whole ct run to speed
things up when we got many different test groups each needing
certificates.
---
 test/http_SUITE_data/http_long_polling.erl | 24 ------------------------
 test/http_SUITE_data/http_loop_recv.erl    | 18 ------------------
 test/http_SUITE_data/http_loop_timeout.erl | 16 ----------------
 3 files changed, 58 deletions(-)
 delete mode 100644 test/http_SUITE_data/http_long_polling.erl
 delete mode 100644 test/http_SUITE_data/http_loop_recv.erl
 delete mode 100644 test/http_SUITE_data/http_loop_timeout.erl

(limited to 'test/http_SUITE_data')

diff --git a/test/http_SUITE_data/http_long_polling.erl b/test/http_SUITE_data/http_long_polling.erl
deleted file mode 100644
index ad4e66e..0000000
--- a/test/http_SUITE_data/http_long_polling.erl
+++ /dev/null
@@ -1,24 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
--module(http_long_polling).
--behaviour(cowboy_http_handler).
--export([init/3, handle/2, info/3, terminate/3]).
-
-init({_Transport, http}, Req, _Opts) ->
-	erlang:send_after(500, self(), timeout),
-	{loop, Req, 5, 5000, hibernate}.
-
-handle(_Req, _State) ->
-	exit(badarg).
-
-info(timeout, Req, 0) ->
-	{ok, Req2} = cowboy_req:reply(102, Req),
-	{ok, Req2, 0};
-info(timeout, Req, State) ->
-	erlang:send_after(500, self(), timeout),
-	{loop, Req, State - 1, hibernate}.
-
-terminate({normal, shutdown}, _, _) ->
-	ok;
-terminate({error, overflow}, _, _) ->
-	ok.
diff --git a/test/http_SUITE_data/http_loop_recv.erl b/test/http_SUITE_data/http_loop_recv.erl
deleted file mode 100644
index d0577f0..0000000
--- a/test/http_SUITE_data/http_loop_recv.erl
+++ /dev/null
@@ -1,18 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
--module(http_loop_recv).
--behaviour(cowboy_loop_handler).
--export([init/3, info/3, terminate/3]).
-
-init({_, http}, Req, _) ->
-	self() ! recv_timeout,
-	{loop, Req, undefined, 500, hibernate}.
-
-info(recv_timeout, Req, State) ->
-	{ok, Body, Req1} = cowboy_req:body(Req),
-	100000 = byte_size(Body),
-	{ok, Req2} = cowboy_req:reply(200, Req1),
-	{ok, Req2, State}.
-
-terminate({normal, shutdown}, _, _) ->
-	ok.
diff --git a/test/http_SUITE_data/http_loop_timeout.erl b/test/http_SUITE_data/http_loop_timeout.erl
deleted file mode 100644
index dd3472c..0000000
--- a/test/http_SUITE_data/http_loop_timeout.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%% Feel free to use, reuse and abuse the code in this file.
-
--module(http_loop_timeout).
--behaviour(cowboy_loop_handler).
--export([init/3, info/3, terminate/3]).
-
-init({_, http}, Req, _) ->
-	erlang:send_after(1000, self(), error_timeout),
-	{loop, Req, undefined, 500, hibernate}.
-
-info(error_timeout, Req, State) ->
-	{ok, Req2} = cowboy_req:reply(500, Req),
-	{ok, Req2, State}.
-
-terminate({normal, timeout}, _, _) ->
-	ok.
-- 
cgit v1.2.3