aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-07-14 19:09:42 +0200
committerLoïc Hoguin <[email protected]>2017-07-14 19:09:42 +0200
commit7d9f6611ae5f935749d3a3b61179e93c5c301838 (patch)
tree9a6afc7b787f754fed92473b1e5340e44a4176e1
parent23fcfe9eead838d75c8e28522ba5e914ce78b117 (diff)
downloadcowboy-7d9f6611ae5f935749d3a3b61179e93c5c301838.tar.gz
cowboy-7d9f6611ae5f935749d3a3b61179e93c5c301838.tar.bz2
cowboy-7d9f6611ae5f935749d3a3b61179e93c5c301838.zip
Fix the remaining http_SUITE test cases
-rw-r--r--test/http_SUITE.erl18
-rw-r--r--test/http_SUITE_data/http_body_qs.erl6
-rw-r--r--test/http_SUITE_data/http_chunked.erl8
3 files changed, 16 insertions, 16 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 5f899e4..29f5c21 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -82,17 +82,17 @@ init_per_group(parse_host, Config) ->
{"/req_attr", http_req_attr, []}
]}
]),
- {ok, _} = cowboy:start_clear(parse_host, [{port, 0}], [
- {env, [{dispatch, Dispatch}]}
- ]),
+ {ok, _} = cowboy:start_clear(parse_host, [{port, 0}], #{
+ env => #{dispatch => Dispatch}
+ }),
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) ->
- {ok, _} = cowboy:start_clear(set_env, [{port, 0}], [
- {env, [{dispatch, []}]}
- ]),
+ {ok, _} = cowboy:start_clear(set_env, [{port, 0}], #{
+ env => #{dispatch => []}
+ }),
Port = ranch:get_port(set_env),
- [{type, tcp}, {port, Port}, {opts, []}|Config].
+ [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config].
end_per_group(Name, _) ->
ok = cowboy:stop_listener(Name).
@@ -286,7 +286,7 @@ echo_body_qs(Config) ->
echo_body_qs_max_length(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),
ok.
diff --git a/test/http_SUITE_data/http_body_qs.erl b/test/http_SUITE_data/http_body_qs.erl
index 09ca5e4..8599640 100644
--- a/test/http_SUITE_data/http_body_qs.erl
+++ b/test/http_SUITE_data/http_body_qs.erl
@@ -10,11 +10,11 @@ init(Req, Opts) ->
{ok, maybe_echo(Method, HasBody, Req), Opts}.
maybe_echo(<<"POST">>, true, Req) ->
- case cowboy_req:read_urlencoded_body(Req) of
- {badlength, Req2} ->
- echo(badlength, Req2);
+ try cowboy_req:read_urlencoded_body(Req) of
{ok, PostVals, Req2} ->
echo(proplists:get_value(<<"echo">>, PostVals), Req2)
+ catch _:_ ->
+ echo(badlength, Req)
end;
maybe_echo(<<"POST">>, false, Req) ->
cowboy_req:reply(400, #{}, <<"Missing body.">>, Req);
diff --git a/test/http_SUITE_data/http_chunked.erl b/test/http_SUITE_data/http_chunked.erl
index 6433f66..645eefe 100644
--- a/test/http_SUITE_data/http_chunked.erl
+++ b/test/http_SUITE_data/http_chunked.erl
@@ -5,11 +5,11 @@
-export([init/2]).
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.
- cowboy_req:chunk([<<>>], Req2),
+ cowboy_req:stream_body([<<>>], nofin, Req2),
timer:sleep(100),
- cowboy_req:chunk("chunked_handler\r\n", Req2),
+ cowboy_req:stream_body("chunked_handler\r\n", nofin, Req2),
timer:sleep(100),
- cowboy_req:chunk("works fine!", Req2),
+ cowboy_req:stream_body("works fine!", fin, Req2),
{ok, Req2, Opts}.