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

Fix the remaining http_SUITE test cases

Browse source
This commit is contained in:
Loïc Hoguin 2017-07-14 19:09:42 +02:00
parent 23fcfe9eea
commit 7d9f6611ae
No known key found for this signature in database
GPG key ID: 71366FF21851DF03
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/http_SUITE.erl
View file

@ -82,17 +82,17 @@ init_per_group(parse_host, Config) ->
{"/req_attr", http_req_attr, []} {"/req_attr", http_req_attr, []}
]} ]}
]), ]),
{ok, _} = cowboy:start_clear(parse_host, [{port, 0}], [ {ok, _} = cowboy:start_clear(parse_host, [{port, 0}], #{
{env, [{dispatch, Dispatch}]} env => #{dispatch => Dispatch}
]), }),
Port = ranch:get_port(parse_host), Port = ranch:get_port(parse_host),
[{type, tcp}, {port, Port}, {opts, []}|Config]; [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config];
init_per_group(set_env, Config) -> init_per_group(set_env, Config) ->
{ok, _} = cowboy:start_clear(set_env, [{port, 0}], [ {ok, _} = cowboy:start_clear(set_env, [{port, 0}], #{
{env, [{dispatch, []}]} env => #{dispatch => []}
]), }),
Port = ranch:get_port(set_env), Port = ranch:get_port(set_env),
[{type, tcp}, {port, Port}, {opts, []}|Config]. [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config].
end_per_group(Name, _) -> end_per_group(Name, _) ->
ok = cowboy:stop_listener(Name). ok = cowboy:stop_listener(Name).
@ -286,7 +286,7 @@ echo_body_qs(Config) ->
echo_body_qs_max_length(Config) -> echo_body_qs_max_length(Config) ->
ConnPid = gun_open(Config), ConnPid = gun_open(Config),
Ref = gun:post(ConnPid, "/echo/body_qs", [], << "echo=", 0:2000000/unit:8 >>), Ref = gun:post(ConnPid, "/echo/body_qs", [], << "echo=", 0:4000000/unit:8 >>),
{response, nofin, 413, _} = gun:await(ConnPid, Ref), {response, nofin, 413, _} = gun:await(ConnPid, Ref),
ok. ok.

6
test/http_SUITE_data/http_body_qs.erl
View file

@ -10,11 +10,11 @@ init(Req, Opts) ->
{ok, maybe_echo(Method, HasBody, Req), Opts}. {ok, maybe_echo(Method, HasBody, Req), Opts}.
maybe_echo(<<"POST">>, true, Req) -> maybe_echo(<<"POST">>, true, Req) ->
case cowboy_req:read_urlencoded_body(Req) of try cowboy_req:read_urlencoded_body(Req) of
{badlength, Req2} ->
echo(badlength, Req2);
{ok, PostVals, Req2} -> {ok, PostVals, Req2} ->
echo(proplists:get_value(<<"echo">>, PostVals), Req2) echo(proplists:get_value(<<"echo">>, PostVals), Req2)
catch _:_ ->
echo(badlength, Req)
end; end;
maybe_echo(<<"POST">>, false, Req) -> maybe_echo(<<"POST">>, false, Req) ->
cowboy_req:reply(400, #{}, <<"Missing body.">>, Req); cowboy_req:reply(400, #{}, <<"Missing body.">>, Req);

8
test/http_SUITE_data/http_chunked.erl
View file

@ -5,11 +5,11 @@
-export([init/2]). -export([init/2]).
init(Req, Opts) -> init(Req, Opts) ->
Req2 = cowboy_req:chunked_reply(200, Req), Req2 = cowboy_req:stream_reply(200, Req),
%% Try an empty chunk to make sure the stream doesn't get closed. %% Try an empty chunk to make sure the stream doesn't get closed.
cowboy_req:chunk([<<>>], Req2), cowboy_req:stream_body([<<>>], nofin, Req2),
timer:sleep(100), timer:sleep(100),
cowboy_req:chunk("chunked_handler\r\n", Req2), cowboy_req:stream_body("chunked_handler\r\n", nofin, Req2),
timer:sleep(100), timer:sleep(100),
cowboy_req:chunk("works fine!", Req2), cowboy_req:stream_body("works fine!", fin, Req2),
{ok, Req2, Opts}. {ok, Req2, Opts}.