umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00
Code Issues Wiki Activity

Make loop handlers work with SPDY

Browse source 
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.
This commit is contained in:
Loïc Hoguin 2014-04-26 13:46:55 +02:00
parent a3f7f68e30
commit 980342f73c
13 changed files with 334 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

76
test/cowboy_test.erl
View file

@ -30,12 +30,32 @@ do_start(App) ->
do_start(App)
end.
%% SSL certificate creation and safekeeping.
make_certs() ->
{_, Cert, Key} = ct_helper:make_certs(),
CertOpts = [{cert, Cert}, {key, Key}],
Pid = spawn(fun() -> receive after infinity -> ok end end),
?MODULE = ets:new(?MODULE, [ordered_set, public, named_table,
{heir, Pid, undefined}]),
ets:insert(?MODULE, {cert_opts, CertOpts}),
ok.
get_certs() ->
ets:lookup_element(?MODULE, cert_opts, 2).
%% Quick configuration value retrieval.
config(Key, Config) ->
{_, Value} = lists:keyfind(Key, 1, Config),
Value.
%% Test case description.
doc(String) ->
ct:comment(String),
ct:log(String).
%% List of all test cases in the suite.
all(Suite) ->
@ -60,8 +80,7 @@ init_http(Ref, ProtoOpts, Config) ->
[{type, tcp}, {port, Port}, {opts, []}|Config].
init_https(Ref, ProtoOpts, Config) ->
{_, Cert, Key} = ct_helper:make_certs(),
Opts = [{cert, Cert}, {key, Key}],
Opts = get_certs(),
{ok, _} = cowboy:start_https(Ref, 100, Opts ++ [{port, 0}], [
{max_keepalive, 50},
{timeout, 500}
@ -70,13 +89,62 @@ init_https(Ref, ProtoOpts, Config) ->
[{type, ssl}, {port, Port}, {opts, Opts}|Config].
init_spdy(Ref, ProtoOpts, Config) ->
{_, Cert, Key} = ct_helper:make_certs(),
Opts = [{cert, Cert}, {key, Key}],
Opts = get_certs(),
{ok, _} = cowboy:start_spdy(Ref, 100, Opts ++ [{port, 0}],
ProtoOpts),
Port = ranch:get_port(Ref),
[{type, ssl}, {port, Port}, {opts, Opts}|Config].
%% Common group of listeners used by most suites.
common_all() ->
[
{group, http},
{group, https},
{group, spdy},
{group, http_compress},
{group, https_compress},
{group, spdy_compress}
].
common_groups(Tests) ->
[
{http, [parallel], Tests},
{https, [parallel], Tests},
{spdy, [parallel], Tests},
{http_compress, [parallel], Tests},
{https_compress, [parallel], Tests},
{spdy_compress, [parallel], Tests}
].
init_common_groups(Name = http, Config, Mod) ->
init_http(Name, [
{env, [{dispatch, Mod:init_dispatch(Config)}]}
], Config);
init_common_groups(Name = https, Config, Mod) ->
init_https(Name, [
{env, [{dispatch, Mod:init_dispatch(Config)}]}
], Config);
init_common_groups(Name = spdy, Config, Mod) ->
init_spdy(Name, [
{env, [{dispatch, Mod:init_dispatch(Config)}]}
], Config);
init_common_groups(Name = http_compress, Config, Mod) ->
init_http(Name, [
{env, [{dispatch, Mod:init_dispatch(Config)}]},
{compress, true}
], Config);
init_common_groups(Name = https_compress, Config, Mod) ->
init_https(Name, [
{env, [{dispatch, Mod:init_dispatch(Config)}]},
{compress, true}
], Config);
init_common_groups(Name = spdy_compress, Config, Mod) ->
init_spdy(Name, [
{env, [{dispatch, Mod:init_dispatch(Config)}]},
{compress, true}
], Config).
%% Support functions for testing using Gun.
gun_open(Config) ->