Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
  • Loading branch information
Whaileee committed Sep 26, 2024
2 parents af74376 + 237f9f0 commit cfdc0c6
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions lib/inets/test/httpc_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,6 @@ init_per_testcase(Name, Config) when Name == pipeline; Name == persistent_connec
{max_pipeline_length, 3} | GivenOptions], Name),

[{profile, Name} | Config];
init_per_testcase(async, Config) ->
{ok,Pid} = inets:start(httpc, [{profile, async}], stand_alone),
[{httpc_pid, Pid} | Config];
init_per_testcase(Case, Config) ->
{ok, _Pid} = inets:start(httpc, [{profile, Case}]),
GivenOptions = proplists:get_value(httpc_options, Config, []),
Expand All @@ -370,9 +367,6 @@ end_per_testcase(Case, Config)
ok
end,
inets:stop(httpc, ?config(profile, Config));
end_per_testcase(async, Config) ->
Pid = proplists:get_value(httpc_pid, Config),
inets:stop(httpc, Pid);
end_per_testcase(_Case, Config) ->
inets:stop(httpc, ?config(profile, Config)).

Expand Down Expand Up @@ -564,7 +558,6 @@ async() ->
[{doc, "Test an asynchrony http request."}].
async(Config) when is_list(Config) ->
Request = {url(group_name(Config), "/dummy.html", Config), []},
HttpcPid = proplists:get_value(httpc_pid, Config),
{ok, RequestId} =
httpc:request(get, Request, [?SSL_NO_VERIFY], [{sync, false}], ?profile(Config)),
Body =
Expand All @@ -589,18 +582,6 @@ async(Config) when is_list(Config) ->
end,
inets_test_lib:check_body(binary_to_list(Body2)),

%% Check receiver alias() option for async request with stand_alone httpc
{ok, RequestId3} =
httpc:request(get, Request, [?SSL_NO_VERIFY], [{sync, false},
{receiver, alias()}], HttpcPid),
Body3 =
receive
{http, {RequestId3, {{_, 200, _}, _, BinBody3}}} ->
BinBody3;
{http, Msg3} ->
ct:fail(Msg3)
end,
inets_test_lib:check_body(binary_to_list(Body3)),
{ok, NewRequestId} =
httpc:request(get, Request, [?SSL_NO_VERIFY], [{sync, false}]),
ok = httpc:cancel_request(NewRequestId).
Expand Down

0 comments on commit cfdc0c6

Please sign in to comment.