diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-09-11 15:56:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-02-05 10:32:24 +0100 |
| commit | b68cc1bd8995e53cec04a37be23bd1709e57bff9 (patch) | |
| tree | 10dd96cffa40703817f3bd1a27eb3a3fa151ed57 /lib/inets/test/httpc_SUITE.erl | |
| parent | 8db1d1d3d38948dd118632b6617b8120299ab4b6 (diff) | |
| download | otp-b68cc1bd8995e53cec04a37be23bd1709e57bff9.tar.gz otp-b68cc1bd8995e53cec04a37be23bd1709e57bff9.tar.bz2 otp-b68cc1bd8995e53cec04a37be23bd1709e57bff9.zip | |
inets: httpc make httpc_cancel_request/[1,2] asynchronous
Conflicts:
lib/inets/src/http_client/httpc_handler.erl
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 51dc7c0f87..c5a9b6168e 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2012. All Rights Reserved. +%% Copyright Ericsson AB 2004-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -305,13 +305,8 @@ async(Config) when is_list(Config) -> {ok, NewRequestId} = httpc:request(get, Request, [], [{sync, false}]), - ok = httpc:cancel_request(NewRequestId), - receive - {http, {NewRequestId, _}} -> - ct:fail(http_cancel_request_failed) - after 3000 -> - ok - end. + ok = httpc:cancel_request(NewRequestId). + %%------------------------------------------------------------------------- save_to_file() -> [{doc, "Test to save the http body to a file"}]. @@ -1143,7 +1138,7 @@ receive_replys([ID|IDs]) -> {http, {ID, {{_, 200, _}, [_|_], _}}} -> receive_replys(IDs); {http, {Other, {{_, 200, _}, [_|_], _}}} -> - ct:fail({recived_canceld_id, Other}) + ct:pal({recived_canceld_id, Other}) end. %% Perform a synchronous stop |