Skip to content

Commit d2075b8

Browse files
committed
Relaxing verification on timeout test on OSX due to CodePlex 295.
1 parent 4f36c5e commit d2075b8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Release/tests/functional/http/client/connections_and_errors.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ TEST_FIXTURE(uri_address, handshake_fail)
172172
}
173173

174174
#if !defined(__cplusplus_winrt)
175-
// This test still sometimes segfaults on Linux, but I'm re-enabling it [AL]
176175
TEST_FIXTURE(uri_address, content_ready_timeout)
177176
{
178177
web::http::experimental::listener::http_listener listener(m_uri);
@@ -195,8 +194,13 @@ TEST_FIXTURE(uri_address, content_ready_timeout)
195194
http_request msg(methods::GET);
196195
http_response rsp = client.request(msg).get();
197196

198-
// The response body should timeout and we should recieve an exception
197+
// The response body should timeout and we should receive an exception
198+
#ifdef __APPLE__
199+
// CodePlex 295
200+
VERIFY_THROWS(rsp.content_ready().wait(), http_exception);
201+
#else
199202
VERIFY_THROWS_HTTP_ERROR_CODE(rsp.content_ready().wait(), std::errc::timed_out);
203+
#endif
200204
}
201205

202206
buf.close(std::ios_base::out).wait();

0 commit comments

Comments
 (0)