aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-11-28 12:45:47 +0100
committerMicael Karlberg <[email protected]>2011-11-28 12:45:47 +0100
commit7de36e35a3409886495a19206bcef934b86e7614 (patch)
treee3b5ac70784d1fb18d0475a30329ecc8e29e3cf6
parent191807cea0a8ac390f0d54e2a4b970f0de7548ae (diff)
parentee353c6eddf4396fa0fa054f7e8f80c72ae0b4f2 (diff)
downloadotp-7de36e35a3409886495a19206bcef934b86e7614.tar.gz
otp-7de36e35a3409886495a19206bcef934b86e7614.tar.bz2
otp-7de36e35a3409886495a19206bcef934b86e7614.zip
Merge branch 'bmk/inets/misc_test_improvements' into bmk/inets/inets58_integration2
-rw-r--r--lib/inets/test/httpd_time_test.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index c54674be36..39ea44fec7 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -377,7 +377,15 @@ validate(ExpStatusCode, SocketType, Socket, Response) ->
"Expected status code: ~p (~s)",
[StatusCode, status_to_message(StatusCode),
ExpStatusCode, status_to_message(ExpStatusCode)]),
- exit({unexpected_response_code, StatusCode, ExpStatusCode})
+ exit({unexpected_response_code, StatusCode, ExpStatusCode});
+ {ok, Unexpected} ->
+ error_msg("Unexpected response split: ~p (~s)",
+ [Unexpected, Response]),
+ exit({unexpected_response, Unexpected, Response});
+ {error, Reason} ->
+ error_msg("Failed processing response: ~p (~s)",
+ [Reason, Response]),
+ exit({failed_response_processing, Reason, Response})
end.