diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-10-14 13:50:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-10-14 13:50:32 +0200 |
| commit | db460f90313bb7adea4ebd4cf0f3cca568ddf118 (patch) | |
| tree | 04c9a60a9afa9a4d0dfadf96b152349ca00e94ad /lib/inets/test | |
| parent | f13b2362c665ef2d98858a4601b1fecf31a21bb5 (diff) | |
| parent | cee5e8344470904f98579fae7046f49d65dbcb33 (diff) | |
| download | otp-db460f90313bb7adea4ebd4cf0f3cca568ddf118.tar.gz otp-db460f90313bb7adea4ebd4cf0f3cca568ddf118.tar.bz2 otp-db460f90313bb7adea4ebd4cf0f3cca568ddf118.zip | |
Merge branch 'ia/inets/http-client-cancel-request/OTP-11312' into maint
* ia/inets/http-client-cancel-request/OTP-11312:
inets: httpc - Remove dead error handling code
inets: httpc make httpc_cancel_request/[1,2] asynchronous
httpc: Enhanched error handling
inets: httpc improve pipelining
Diffstat (limited to 'lib/inets/test')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 0c35f284f7..818edc12ac 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -277,9 +277,6 @@ trace(Config) when is_list(Config) -> pipeline(Config) when is_list(Config) -> Request = {url(group_name(Config), "/dummy.html", Config), []}, {ok, _} = httpc:request(get, Request, [], [], pipeline), - - %% Make sure pipeline session is registerd - test_server:sleep(4000), keep_alive_requests(Request, pipeline). %%-------------------------------------------------------------------- @@ -287,9 +284,6 @@ pipeline(Config) when is_list(Config) -> persistent_connection(Config) when is_list(Config) -> Request = {url(group_name(Config), "/dummy.html", Config), []}, {ok, _} = httpc:request(get, Request, [], [], persistent), - - %% Make sure pipeline session is registerd - test_server:sleep(4000), keep_alive_requests(Request, persistent). %%------------------------------------------------------------------------- @@ -311,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"}]. @@ -1149,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 |