aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpc_SUITE.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2010-02-12 15:55:58 +0000
committerErlang/OTP <[email protected]>2010-02-13 07:29:10 +0100
commitd9286a9a68e8b10dcf006a60ec84a0439e725fac (patch)
treed49cd8f54778f192593be6943b1661b9d1772d7e /lib/inets/test/httpc_SUITE.erl
parentba3758531a0b6dc6797457279e1ce0f99d282d20 (diff)
downloadotp-d9286a9a68e8b10dcf006a60ec84a0439e725fac.tar.gz
otp-d9286a9a68e8b10dcf006a60ec84a0439e725fac.tar.bz2
otp-d9286a9a68e8b10dcf006a60ec84a0439e725fac.zip
OTP-8431: Fix error handling of httpc_manager and its starter process
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
-rw-r--r--lib/inets/test/httpc_SUITE.erl22
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 96099c49fd..aa65fb1197 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -1440,13 +1440,31 @@ proxy_page_does_not_exist(Config) when is_list(Config) ->
%%-------------------------------------------------------------------------
+
proxy_https_not_supported(doc) ->
[];
proxy_https_not_supported(suite) ->
[];
proxy_https_not_supported(Config) when is_list(Config) ->
- {error, {failed_connecting, https_through_proxy_is_not_currently_supported}} =
- http:request(get, {"https://login.yahoo.com", []}, [], []),
+ Result = http:request(get, {"https://login.yahoo.com", []}, [], []),
+ case Result of
+ {error, Reason} ->
+ %% ok so far
+ case Reason of
+ {failed_connecting, Why} ->
+ %% ok, now check why
+ case Why of
+ https_through_proxy_is_not_currently_supported ->
+ ok;
+ _ ->
+ tsf({unexpected_why, Why})
+ end;
+ _ ->
+ tsf({unexpected_reason, Reason})
+ end;
+ _ ->
+ tsf({unexpected_result, Result})
+ end,
ok.