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

Change a few flaky tests to use timetrap and infinity timeouts

Browse source 
The experiment was successful in Gun, let's see if it helps
with Cowboy as well.
This commit is contained in:
Loïc Hoguin 2020-04-01 21:11:59 +02:00
parent 8471788826
commit 2b65b575c6
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/req_SUITE.erl
View file

@ -22,6 +22,9 @@
%% ct. %% ct.
suite() ->
[{timetrap, 30000}].
all() -> all() ->
cowboy_test:common_all(). cowboy_test:common_all().
@ -532,11 +535,11 @@ do_read_body_expect_100_continue(Path, Config) ->
{<<"content-length">>, integer_to_binary(byte_size(Body))} {<<"content-length">>, integer_to_binary(byte_size(Body))}
], ],
Ref = gun:post(ConnPid, Path, Headers), Ref = gun:post(ConnPid, Path, Headers),
{inform, 100, []} = gun:await(ConnPid, Ref), {inform, 100, []} = gun:await(ConnPid, Ref, infinity),
gun:data(ConnPid, Ref, fin, Body), gun:data(ConnPid, Ref, fin, Body),
{response, IsFin, 200, RespHeaders} = gun:await(ConnPid, Ref), {response, IsFin, 200, RespHeaders} = gun:await(ConnPid, Ref, infinity),
{ok, RespBody} = case IsFin of {ok, RespBody} = case IsFin of
nofin -> gun:await_body(ConnPid, Ref); nofin -> gun:await_body(ConnPid, Ref, infinity);
fin -> {ok, <<>>} fin -> {ok, <<>>}
end, end,
gun:close(ConnPid), gun:close(ConnPid),

11
test/rfc7230_SUITE.erl
View file

@ -24,6 +24,9 @@
-import(cowboy_test, [raw_recv_head/1]). -import(cowboy_test, [raw_recv_head/1]).
-import(cowboy_test, [raw_recv/3]). -import(cowboy_test, [raw_recv/3]).
suite() ->
[{timetrap, 30000}].
all() -> [{group, http}]. all() -> [{group, http}].
groups() -> [{http, [parallel], ct_helper:all(?MODULE)}]. groups() -> [{http, [parallel], ct_helper:all(?MODULE)}].
@ -1557,10 +1560,10 @@ pipeline(Config) ->
gun:post(ConnPid, "/full/read_body", [], <<0:800000>>) gun:post(ConnPid, "/full/read_body", [], <<0:800000>>)
} || _ <- lists:seq(1, 25)], } || _ <- lists:seq(1, 25)],
_ = [begin _ = [begin
{response, nofin, 200, _} = gun:await(ConnPid, Ref1), {response, nofin, 200, _} = gun:await(ConnPid, Ref1, infinity),
{ok, <<"Hello world!">>} = gun:await_body(ConnPid, Ref1), {ok, <<"Hello world!">>} = gun:await_body(ConnPid, Ref1, infinity),
{response, nofin, 200, _} = gun:await(ConnPid, Ref2), {response, nofin, 200, _} = gun:await(ConnPid, Ref2, infinity),
{ok, <<0:800000>>} = gun:await_body(ConnPid, Ref2) {ok, <<0:800000>>} = gun:await_body(ConnPid, Ref2, infinity)
end || {Ref1, Ref2} <- Refs], end || {Ref1, Ref2} <- Refs],
ok. ok.