From 7d9f6611ae5f935749d3a3b61179e93c5c301838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 14 Jul 2017 19:09:42 +0200 Subject: Fix the remaining http_SUITE test cases --- test/http_SUITE_data/http_body_qs.erl | 6 +++--- test/http_SUITE_data/http_chunked.erl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/http_SUITE_data') 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}. -- cgit v1.2.3