aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpd_basic_SUITE.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-02-06 15:26:28 +0100
committerMicael Karlberg <[email protected]>2012-02-06 15:26:28 +0100
commitb2eeb740c6e013055603aaaee1570550d380b720 (patch)
treee332e7f1270c6de2103fc7d163999a27ba4e40e8 /lib/inets/test/httpd_basic_SUITE.erl
parentdcf35c1ef914f7473bb64fa9175af2cf42744885 (diff)
parent0d580acdc51bd88a0d364b76ac35fcf2506c2d9e (diff)
downloadotp-b2eeb740c6e013055603aaaee1570550d380b720.tar.gz
otp-b2eeb740c6e013055603aaaee1570550d380b720.tar.bz2
otp-b2eeb740c6e013055603aaaee1570550d380b720.zip
Merge branch 'bmk/inets/httpc/checking_ipv6_on_windows' into bmk/inets/inets59_integration
Diffstat (limited to 'lib/inets/test/httpd_basic_SUITE.erl')
-rw-r--r--lib/inets/test/httpd_basic_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 4cd38f2ec4..be0bcc67d5 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -202,8 +202,8 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
{ok, {200, _}} ->
%% Don't care about the the body, just that we get a ok response
ok;
- {ok, UnexpectedOK1} ->
- tsf({unexpected_ok_1, UnexpectedOK1})
+ {ok, {StatusCode1, Body1}} ->
+ tsf({unexpected_ok_1, StatusCode1, Body1})
end,
%% Request 2
@@ -216,8 +216,8 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
{ok, {200, _}} ->
%% Don't care about the the body, just that we get a ok response
ok;
- {ok, UnexpectedOK2} ->
- tsf({unexpected_ok_2, UnexpectedOK2})
+ {ok, {StatusCode2, Body2}} ->
+ tsf({unexpected_ok_2, StatusCode2, Body2})
end,
%% Request 3
@@ -238,7 +238,7 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
tsf({unexpected_path_3, HTMLEncodedPath, BadPath3})
end;
{ok, UnexpectedOK3} ->
- tsf({unexpected_ok_1, UnexpectedOK3})
+ tsf({unexpected_ok_3, UnexpectedOK3})
end,
%% Request 4
@@ -253,7 +253,7 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
HTMLEncodedPath ->
ok;
BadPath4 ->
- tsf({unexpected_path_2, HTMLEncodedPath, BadPath4})
+ tsf({unexpected_path_4, HTMLEncodedPath, BadPath4})
end;
{ok, UnexpectedOK4} ->
tsf({unexpected_ok_4, UnexpectedOK4})