Relaxing verification on timeout test on OSX due to CodePlex 295.

Author: stgates

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

@@ -134,8 +134,14 @@ TEST_FIXTURE(uri_address, request_timeout)
     config.set_timeout(utility::seconds(1));
 
     http_client client(m_uri, config);
-
-    VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).get(), std::errc::timed_out);
+    auto responseTask = client.request(methods::GET);
+    
+#ifdef __APPLE__
+    // CodePlex 295
+    VERIFY_THROWS(responseTask.get(), http_exception);
+#else
+    VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::timed_out);
+#endif
 }
 
 TEST_FIXTURE(uri_address, invalid_method)

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

@@ -308,7 +308,13 @@ TEST_FIXTURE(uri_address, set_progress_handler_request_timeout)
     msg.set_body(data);
 
     auto response = client.request(msg);
+    
+#ifdef __APPLE__
+    // CodePlex 295
+    VERIFY_THROWS(response.get(), http_exception);
+#else
     VERIFY_THROWS_HTTP_ERROR_CODE(response.get(), std::errc::timed_out);
+#endif
     VERIFY_ARE_EQUAL(26u*repeats, upsize);
     VERIFY_ARE_EQUAL(4711u, downsize);
     // We don't have very precise control over how much of the message is transferred