From d9286a9a68e8b10dcf006a60ec84a0439e725fac Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Fri, 12 Feb 2010 15:55:58 +0000 Subject: OTP-8431: Fix error handling of httpc_manager and its starter process OTP-8431: jean-sebastien.pedron@dumbbell.fr --- lib/inets/test/httpc_SUITE.erl | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'lib/inets/test') 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. -- cgit v1.2.3