Merge branch 'development' of https://git01.codeplex.com/casablanca into windows_server_cert

Author: stgates

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

@@ -183,7 +183,7 @@ TEST_FIXTURE(uri_address, content_ready_timeout)
     {
         http_response response(200);
         response.set_body(streams::istream(buf), U("text/plain"));
-        response.headers().add(header_names::connection, U("close")); 
+        response.headers().add(header_names::connection, U("close"));
         request.reply(response);
     });
 
@@ -195,7 +195,7 @@ TEST_FIXTURE(uri_address, content_ready_timeout)
         http_response rsp = client.request(msg).get();
 
         // The response body should timeout and we should receive an exception
-#ifdef __APPLE__
+#ifndef _MS_WINDOWS
         // CodePlex 295
         VERIFY_THROWS(rsp.content_ready().wait(), http_exception);
 #else
@@ -231,7 +231,7 @@ TEST_FIXTURE(uri_address, stream_timeout)
 
         // The response body should timeout and we should receive an exception
         auto readTask = rsp.body().read_to_end(streams::producer_consumer_buffer<uint8_t>());
-#ifdef __APPLE__
+#ifdef _MS_WINDOWS
         // CodePlex 295
         VERIFY_THROWS(readTask.get(), http_exception);
 #else

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

@@ -366,7 +366,10 @@ TEST_FIXTURE(uri_address, download_nobody_exception)
     VERIFY_THROWS(client.request(msg).get().content_ready().get(), std::invalid_argument);
 }
 
-TEST_FIXTURE(uri_address, data_upload_exception, "Ignore:Linux", "898953", "Ignore:Apple", "898953")
+TEST_FIXTURE(uri_address, data_upload_exception,
+             "Ignore:Linux", "296",
+             "Ignore:Apple", "296",
+             "Ignore:Android", "296")
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client client(m_uri);