Re-enabling a bunch of http client tests.

Author: stgates

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

@@ -252,7 +252,7 @@ TEST_FIXTURE(uri_address, cancel_before_request)
 
 // This test can't be implemented with our test server so isn't available on WinRT.
 #ifndef __cplusplus_winrt
-TEST_FIXTURE(uri_address, cancel_after_headers, "Ignore:Apple", "220")
+TEST_FIXTURE(uri_address, cancel_after_headers)
 {
     web::http::experimental::listener::http_listener listener(m_uri);
     listener.open().wait();
@@ -280,11 +280,17 @@ TEST_FIXTURE(uri_address, cancel_after_headers, "Ignore:Apple", "220")
     ev.set();
 
     VERIFY_THROWS_HTTP_ERROR_CODE(response.extract_string().get(), std::errc::operation_canceled);
+    
+    // Codeplex 328.
+#if !defined(_WIN32)
+    tests::common::utilities::os_utilities::sleep(1000);
+#endif
+    
     listener.close().wait();
 }
 #endif
 
-TEST_FIXTURE(uri_address, cancel_after_body, "Ignore:Apple", "220")
+TEST_FIXTURE(uri_address, cancel_after_body)
 {
     test_http_server::scoped_server scoped(m_uri);
     test_http_server * p_server = scoped.server();
@@ -305,7 +311,7 @@ TEST_FIXTURE(uri_address, cancel_after_body, "Ignore:Apple", "220")
     response.content_ready().wait();
 }
 
-TEST_FIXTURE(uri_address, cancel_with_error, "Ignore:Apple", "220")
+TEST_FIXTURE(uri_address, cancel_with_error)
 {
     test_http_server server(m_uri);
     VERIFY_ARE_EQUAL(0, server.open());
@@ -320,7 +326,7 @@ TEST_FIXTURE(uri_address, cancel_with_error, "Ignore:Apple", "220")
     VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::operation_canceled);
 }
 
-TEST_FIXTURE(uri_address, cancel_while_uploading_data, "Ignore:Linux", "220", "Ignore:Apple", "220")
+TEST_FIXTURE(uri_address, cancel_while_uploading_data)
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client c(m_uri);
@@ -337,7 +343,7 @@ TEST_FIXTURE(uri_address, cancel_while_uploading_data, "Ignore:Linux", "220", "I
 
 // This test can't be implemented with our test server since it doesn't stream data so isn't avaliable on WinRT.
 #ifndef __cplusplus_winrt
-TEST_FIXTURE(uri_address, cancel_while_downloading_data, "Ignore:Apple", "220")
+TEST_FIXTURE(uri_address, cancel_while_downloading_data)
 {
     web::http::experimental::listener::http_listener listener(m_uri);
     listener.open().wait();
@@ -369,6 +375,11 @@ TEST_FIXTURE(uri_address, cancel_while_downloading_data, "Ignore:Apple", "220")
 
     VERIFY_THROWS_HTTP_ERROR_CODE(response.extract_string().get(), std::errc::operation_canceled);
 
+    // Codeplex 328.
+#if !defined(_WIN32)
+    tests::common::utilities::os_utilities::sleep(1000);
+#endif
+    
     listener.close().wait();
 }
 #endif

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

@@ -320,7 +320,7 @@ TEST_FIXTURE(uri_address, set_progress_handler_request_timeout)
     VERIFY_IS_TRUE(calls >= 2);
 }
 
-TEST_FIXTURE(uri_address, upload_nobody_exception, "Ignore:Apple", "900236", "Ignore:Linux", "900236")
+TEST_FIXTURE(uri_address, upload_nobody_exception, "Ignore:Apple", "155", "Ignore:Linux", "155")
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client client(m_uri);
@@ -338,6 +338,11 @@ TEST_FIXTURE(uri_address, upload_nobody_exception, "Ignore:Apple", "900236", "Ig
     });
 
     VERIFY_THROWS(client.request(msg).get(), std::invalid_argument);
+    
+    // Codeplex 328.
+#if !defined(_WIN32)
+    tests::common::utilities::os_utilities::sleep(1000);
+#endif
 }
 
 TEST_FIXTURE(uri_address, download_nobody_exception)
@@ -364,10 +369,7 @@ 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", "296",
-             "Ignore:Apple", "296",
-             "Ignore:Android", "296")
+TEST_FIXTURE(uri_address, data_upload_exception)
 {
     test_http_server::scoped_server scoped(m_uri);
     http_client client(m_uri);
@@ -380,6 +382,11 @@ TEST_FIXTURE(uri_address, data_upload_exception,
     });
 
     VERIFY_THROWS(client.request(msg).get(), std::invalid_argument);
+    
+    // Codeplex 328.
+#if !defined(_WIN32)
+    tests::common::utilities::os_utilities::sleep(1000);
+#endif
 }
 
 TEST_FIXTURE(uri_address, data_download_exception)

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

@@ -379,9 +379,11 @@ TEST_FIXTURE(uri_address, stream_close_early_with_exception)
 
     // Verify that the responseTask throws the exception set when closing the stream
     VERIFY_THROWS(responseTask.get(), test_exception);
-    
+
     // Codeplex 328.
+#if !defined(_WIN32)
     tests::common::utilities::os_utilities::sleep(1000);
+#endif
 }
 #endif