From 3e05ab8f82ac69da7c55d1b28284c32ea63186c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sun, 22 Jan 2017 10:50:39 +0100 Subject: Add experimental cowboy_compress_h stream handler Currently marked as experimental because it can't be tweaked (just enabled/disabled) and because it is not documented yet. --- test/cowboy_test.erl | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) (limited to 'test/cowboy_test.erl') diff --git a/test/cowboy_test.erl b/test/cowboy_test.erl index bb74ad0..a219878 100644 --- a/test/cowboy_test.erl +++ b/test/cowboy_test.erl @@ -43,10 +43,11 @@ common_all() -> {group, http}, {group, https}, {group, h2}, - {group, h2c}%, -%% @todo -% {group, http_compress}, -% {group, https_compress} + {group, h2c}, + {group, http_compress}, + {group, https_compress}, + {group, h2_compress}, + {group, h2c_compress} ]. common_groups(Tests) -> @@ -54,31 +55,51 @@ common_groups(Tests) -> {http, [parallel], Tests}, {https, [parallel], Tests}, {h2, [parallel], Tests}, - {h2c, [parallel], Tests}%, -%% @todo -% {http_compress, [parallel], Tests}, -% {https_compress, [parallel], Tests} + {h2c, [parallel], Tests}, + {http_compress, [parallel], Tests}, + {https_compress, [parallel], Tests}, + {h2_compress, [parallel], Tests}, + {h2c_compress, [parallel], Tests} ]. init_common_groups(Name = http, Config, Mod) -> - init_http(Name, #{env => #{dispatch => Mod:init_dispatch(Config)}}, Config); + 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_https(Name, #{ + env => #{dispatch => Mod:init_dispatch(Config)} + }, Config); init_common_groups(Name = h2, Config, Mod) -> - init_http2(Name, #{env => #{dispatch => Mod:init_dispatch(Config)}}, Config); + init_http2(Name, #{ + env => #{dispatch => Mod:init_dispatch(Config)} + }, Config); init_common_groups(Name = h2c, Config, Mod) -> - Config1 = init_http(Name, #{env => #{dispatch => Mod:init_dispatch(Config)}}, Config), + Config1 = init_http(Name, #{ + env => #{dispatch => Mod:init_dispatch(Config)} + }, Config), lists:keyreplace(protocol, 1, Config1, {protocol, http2}); init_common_groups(Name = http_compress, Config, Mod) -> init_http(Name, #{ env => #{dispatch => Mod:init_dispatch(Config)}, - compress => true + stream_handlers => [cowboy_compress_h, cowboy_stream_h] }, Config); init_common_groups(Name = https_compress, Config, Mod) -> init_https(Name, #{ env => #{dispatch => Mod:init_dispatch(Config)}, - compress => true - }, Config). + stream_handlers => [cowboy_compress_h, cowboy_stream_h] + }, Config); +init_common_groups(Name = h2_compress, Config, Mod) -> + init_http2(Name, #{ + env => #{dispatch => Mod:init_dispatch(Config)}, + stream_handlers => [cowboy_compress_h, cowboy_stream_h] + }, Config); +init_common_groups(Name = h2c_compress, Config, Mod) -> + Config1 = init_http(Name, #{ + env => #{dispatch => Mod:init_dispatch(Config)}, + stream_handlers => [cowboy_compress_h, cowboy_stream_h] + }, Config), + lists:keyreplace(protocol, 1, Config1, {protocol, http2}). %% Support functions for testing using Gun. -- cgit v1.2.3