From 36b32194b74dbc55e12feaab265724ec864dccd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 17 May 2018 21:02:54 +0200 Subject: Remove the parse_host test from old_http_SUITE It seems to just be a duplicate of something we now have in Cowlib. --- test/old_http_SUITE.erl | 37 +----------------------------- test/old_http_SUITE_data/http_req_attr.erl | 15 ------------ 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 test/old_http_SUITE_data/http_req_attr.erl (limited to 'test') diff --git a/test/old_http_SUITE.erl b/test/old_http_SUITE.erl index 5464702..260a47e 100644 --- a/test/old_http_SUITE.erl +++ b/test/old_http_SUITE.erl @@ -34,22 +34,18 @@ all() -> {group, https}, {group, http_compress}, {group, https_compress}, - {group, parse_host}, {group, set_env} ]. groups() -> Tests = ct_helper:all(?MODULE) -- [ - parse_host, set_env_dispatch + set_env_dispatch ], [ {http, [], Tests}, %% @todo parallel {https, [parallel], Tests}, {http_compress, [parallel], Tests}, {https_compress, [parallel], Tests}, - {parse_host, [], [ - parse_host - ]}, {set_env, [], [ set_env_dispatch ]} @@ -69,17 +65,6 @@ init_per_group(Name = https_compress, Config) -> env => #{dispatch => init_dispatch(Config)}, compress => true }, Config); -init_per_group(parse_host, Config) -> - Dispatch = cowboy_router:compile([ - {'_', [ - {"/req_attr", http_req_attr, []} - ]} - ]), - {ok, _} = cowboy:start_clear(parse_host, [{port, 0}], #{ - env => #{dispatch => Dispatch} - }), - Port = ranch:get_port(parse_host), - [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config]; init_per_group(set_env, Config) -> {ok, _} = cowboy:start_clear(set_env, [{port, 0}], #{ env => #{dispatch => []} @@ -335,26 +320,6 @@ nc_rand(Config) -> nc_zero(Config) -> do_nc(Config, "/dev/zero"). -parse_host(Config) -> - ConnPid = gun_open(Config), - Tests = [ - {<<"example.org:8080">>, <<"example.org\n8080">>}, - {<<"example.org">>, <<"example.org\n80">>}, - {<<"192.0.2.1:8080">>, <<"192.0.2.1\n8080">>}, - {<<"192.0.2.1">>, <<"192.0.2.1\n80">>}, - {<<"[2001:db8::1]:8080">>, <<"[2001:db8::1]\n8080">>}, - {<<"[2001:db8::1]">>, <<"[2001:db8::1]\n80">>}, - {<<"[::ffff:192.0.2.1]:8080">>, <<"[::ffff:192.0.2.1]\n8080">>}, - {<<"[::ffff:192.0.2.1]">>, <<"[::ffff:192.0.2.1]\n80">>} - ], - [begin - Ref = gun:get(ConnPid, "/req_attr?attr=host_and_port", - [{<<"host">>, Host}]), - {response, nofin, 200, _} = gun:await(ConnPid, Ref), - {ok, Body} = gun:await_body(ConnPid, Ref) - end || {Host, Body} <- Tests], - ok. - rest_param_all(Config) -> ConnPid = gun_open(Config), %% Accept without param. diff --git a/test/old_http_SUITE_data/http_req_attr.erl b/test/old_http_SUITE_data/http_req_attr.erl deleted file mode 100644 index c6a940e..0000000 --- a/test/old_http_SUITE_data/http_req_attr.erl +++ /dev/null @@ -1,15 +0,0 @@ -%% Feel free to use, reuse and abuse the code in this file. - -%% @todo That module was clearly meant to do more than one -%% thing and yet doesn't. --module(http_req_attr). - --export([init/2]). - -init(Req, Opts) -> - #{attr := Attr} = cowboy_req:match_qs([attr], Req), - <<"host_and_port">> = Attr, - Host = cowboy_req:host(Req), - Port = cowboy_req:port(Req), - Value = [Host, "\n", integer_to_list(Port)], - {ok, cowboy_req:reply(200, #{}, Value, Req), Opts}. -- cgit v1.2.3