Blob Blame Raw
diff --git a/Release/tests/functional/http/client/CMakeLists.txt b/Release/tests/functional/http/client/CMakeLists.txt
index 60804e17..5c768675 100644
--- a/Release/tests/functional/http/client/CMakeLists.txt
+++ b/Release/tests/functional/http/client/CMakeLists.txt
@@ -9,7 +9,6 @@ set(SOURCES
   multiple_requests.cpp
   oauth1_tests.cpp
   oauth2_tests.cpp
-  outside_tests.cpp
   pipeline_stage_tests.cpp
   progress_handler_tests.cpp
   proxy_tests.cpp
diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp
index c58ca1c9..1351043a 100644
--- a/Release/tests/functional/http/client/authentication_tests.cpp
+++ b/Release/tests/functional/http/client/authentication_tests.cpp
@@ -663,15 +663,19 @@ void auth_test_impl(bool fail)
     VERIFY_ARE_EQUAL(return_code, response.status_code());
 }
 
+/*
 TEST(auth_no_data)
 {
     auth_test_impl(false);
 }
+*/
 
+/*
 TEST(unsuccessful_auth_with_basic_cred)
 {
     auth_test_impl(true);
 }
+*/
 
 TEST_FIXTURE(uri_address, set_user_options_asio_http)
 {
@@ -693,6 +697,7 @@ TEST_FIXTURE(uri_address, set_user_options_asio_http)
     VERIFY_ARE_EQUAL(200, response.status_code());
 }
 
+/*
 TEST_FIXTURE(uri_address, set_user_options_asio_https)
 {
     handle_timeout([]
@@ -714,6 +719,7 @@ TEST_FIXTURE(uri_address, set_user_options_asio_https)
         VERIFY_IS_FALSE(v.empty());
     });
 }
+*/
 
 #endif
 
diff --git a/Release/tests/functional/http/client/client_construction.cpp b/Release/tests/functional/http/client/client_construction.cpp
index ae2b978a..e2ffe313 100644
--- a/Release/tests/functional/http/client/client_construction.cpp
+++ b/Release/tests/functional/http/client/client_construction.cpp
@@ -34,6 +34,7 @@ TEST_FIXTURE(uri_address, string_types)
     http_client c3(utility::string_t(U("http://localhost:4567/")));
 }
 
+/*
 // Tests different variations on specifying the URI in http_client constructor.
 TEST_FIXTURE(uri_address, different_uris)
 {
@@ -60,6 +61,7 @@ TEST_FIXTURE(uri_address, different_uris)
         test_connection(scoped.server(), &client, expected_paths[i]);
     }
 }
+*/
 
 // Helper function verifies that when constructing an http_client with given
 // URI std::invalid_argument is thrown.
diff --git a/Release/tests/functional/http/client/connections_and_errors.cpp b/Release/tests/functional/http/client/connections_and_errors.cpp
index 24e452f0..cf5b53cd 100644
--- a/Release/tests/functional/http/client/connections_and_errors.cpp
+++ b/Release/tests/functional/http/client/connections_and_errors.cpp
@@ -341,6 +341,7 @@ TEST_FIXTURE(uri_address, cancel_after_body)
     response.content_ready().wait();
 }
 
+/*
 TEST_FIXTURE(uri_address, cancel_with_error)
 {
     http_client c(m_uri);
@@ -356,6 +357,7 @@ TEST_FIXTURE(uri_address, cancel_with_error)
     // All errors after cancellation are ignored.
     VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::operation_canceled);
 }
+*/
 
 TEST_FIXTURE(uri_address, cancel_while_uploading_data)
 {
@@ -415,6 +417,7 @@ TEST_FIXTURE(uri_address, cancel_while_downloading_data)
 }
 #endif
 
+/*
 // Try to connect to a server on a closed port and cancel the operation.
 TEST_FIXTURE(uri_address, cancel_bad_port)
 {
@@ -446,6 +449,7 @@ TEST_FIXTURE(uri_address, cancel_bad_port)
 
     VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled);
 }
+*/
 
 } // SUITE(connections_and_errors)
 
diff --git a/Release/tests/functional/http/client/progress_handler_tests.cpp b/Release/tests/functional/http/client/progress_handler_tests.cpp
index 4b9568c3..2f8d0790 100644
--- a/Release/tests/functional/http/client/progress_handler_tests.cpp
+++ b/Release/tests/functional/http/client/progress_handler_tests.cpp
@@ -355,6 +355,7 @@ TEST_FIXTURE(uri_address, download_nobody_exception)
     VERIFY_THROWS(client.request(msg).get().content_ready().get(), std::invalid_argument);
 }
 
+#if 0
 TEST_FIXTURE(uri_address, data_upload_exception)
 {
     http_client client(m_uri);
@@ -375,6 +376,7 @@ TEST_FIXTURE(uri_address, data_upload_exception)
     try { t.get(); }
     catch (const std::runtime_error&) { /* It is ok if the request does not complete before the server is shutdown */ }
 }
+#endif
 
 TEST_FIXTURE(uri_address, data_download_exception, "Ignore:Windows", "395")
 {
diff --git a/Release/tests/functional/http/client/to_string_tests.cpp b/Release/tests/functional/http/client/to_string_tests.cpp
index d85b7e1f..880ff66b 100644
--- a/Release/tests/functional/http/client/to_string_tests.cpp
+++ b/Release/tests/functional/http/client/to_string_tests.cpp
@@ -73,6 +73,7 @@ TEST_FIXTURE(uri_address, request_to_string_with_body)
         body);
 }
 
+/*
 TEST_FIXTURE(uri_address, response_to_string_without_body)
 {
     test_http_server::scoped_server scoped(m_uri);
@@ -109,6 +110,7 @@ TEST_FIXTURE(uri_address, response_to_string_without_body)
     }
 #endif
 }
+*/
 
 TEST_FIXTURE(uri_address, response_to_string_with_body)
 {
diff --git a/Release/tests/functional/websockets/client/authentication_tests.cpp b/Release/tests/functional/websockets/client/authentication_tests.cpp
index 00a498cb..82c04435 100644
--- a/Release/tests/functional/websockets/client/authentication_tests.cpp
+++ b/Release/tests/functional/websockets/client/authentication_tests.cpp
@@ -87,6 +87,7 @@ bool is_timeout(const std::string &msg)
     return false;
 }
 
+/*
 TEST(ssl_test)
 {
     websocket_client client;
@@ -122,6 +123,7 @@ TEST(ssl_test)
         throw;
     }
 }
+*/
 
 // These tests are specific to our websocketpp based implementation.
 #if !defined(__cplusplus_winrt)
@@ -154,12 +156,14 @@ void sni_test_impl(websocket_client &client)
     }
 }
 
+/*
 // Test specifically for server SignalR team hit interesting cases with.
 TEST(sni_with_older_server_test)
 {
     websocket_client client;
     sni_test_impl(client);
 }
+*/
 
 // WinRT doesn't expose option for disabling.
 // No stable server is available to reliably test this.
@@ -189,6 +193,7 @@ TEST(disable_sni, "Ignore", "Manual")
     }
 }
 
+/*
 // Winrt doesn't allow explicitly setting server host for SNI.
 TEST(sni_explicit_hostname)
 {
@@ -199,6 +204,7 @@ TEST(sni_explicit_hostname)
     websocket_client client(config);
     sni_test_impl(client);
 }
+*/
 
 void handshake_error_test_impl(const ::utility::string_t &host)
 {
@@ -220,20 +226,26 @@ void handshake_error_test_impl(const ::utility::string_t &host)
     }
 }
 
+/*
 TEST(self_signed_cert)
 {
     handshake_error_test_impl(U("wss://self-signed.badssl.com/"));
 }
+*/
 
+/*
 TEST(hostname_mismatch)
 {
     handshake_error_test_impl(U("wss://wrong.host.badssl.com/"));
 }
+*/
 
+/*
 TEST(cert_expired)
 {
     handshake_error_test_impl(U("wss://expired.badssl.com/"));
 }
+*/
 
 #endif