diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 00:34:12 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 00:34:12 +0000 |
| commit | 9ef1d98ebfbd9d3e89e7c4aefcf85d55f24f4c64 (patch) | |
| tree | 5606d66723f57aa67b5f3d173650509fcc606327 | |
| parent | a67fc9e162b895cf642c077de28c73172066c558 (diff) | |
| download | chromium_src-9ef1d98ebfbd9d3e89e7c4aefcf85d55f24f4c64.zip chromium_src-9ef1d98ebfbd9d3e89e7c4aefcf85d55f24f4c64.tar.gz chromium_src-9ef1d98ebfbd9d3e89e7c4aefcf85d55f24f4c64.tar.bz2 | |
Flakiness cleanup: disable flaky tests under net/
See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6
BUG=74387,112682,25045
Review URL: https://chromiumcodereview.appspot.com/9350047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121783 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/disk_cache/backend_unittest.cc | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 6 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 18 |
3 files changed, 14 insertions, 12 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 21875b5..df8d90f 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -923,7 +923,7 @@ TEST_F(DiskCacheBackendTest, MemoryOnlyEnumerations) { } // Flaky, http://crbug.com/74387. -TEST_F(DiskCacheBackendTest, FLAKY_AppCacheEnumerations) { +TEST_F(DiskCacheBackendTest, DISABLED_AppCacheEnumerations) { SetCacheType(net::APP_CACHE); BackendEnumerations(); } diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index c482b31..e1c4ba4 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -5209,8 +5209,9 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { EXPECT_EQ(OK, rv); } +// http://crbug.com/112682 #if defined(OS_MACOSX) -#define MAYBE_SOCKS4_HTTP_GET FLAKY_SOCKS4_HTTP_GET +#define MAYBE_SOCKS4_HTTP_GET DISABLED_SOCKS4_HTTP_GET #else #define MAYBE_SOCKS4_HTTP_GET SOCKS4_HTTP_GET #endif @@ -5266,8 +5267,9 @@ TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_HTTP_GET) { EXPECT_EQ("Payload", response_text); } +// http://crbug.com/112682 #if defined(OS_MACOSX) -#define MAYBE_SOCKS4_SSL_GET FLAKY_SOCKS4_SSL_GET +#define MAYBE_SOCKS4_SSL_GET DISABLED_SOCKS4_SSL_GET #else #define MAYBE_SOCKS4_SSL_GET SOCKS4_SSL_GET #endif diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index e6c4c31..7c4890a 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -3642,7 +3642,7 @@ class URLRequestTestFTP : public URLRequestTest { }; // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPDirectoryListing) { +TEST_F(URLRequestTestFTP, DISABLED_FTPDirectoryListing) { ASSERT_TRUE(test_server_.Start()); TestDelegate d; @@ -3666,7 +3666,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPDirectoryListing) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPGetTestAnonymous) { +TEST_F(URLRequestTestFTP, DISABLED_FTPGetTestAnonymous) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3696,7 +3696,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPGetTestAnonymous) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPGetTest) { +TEST_F(URLRequestTestFTP, DISABLED_FTPGetTest) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3728,7 +3728,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPGetTest) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongPassword) { +TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPassword) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3758,7 +3758,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongPassword) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongPasswordRestart) { +TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPasswordRestart) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3791,7 +3791,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongPasswordRestart) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongUser) { +TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUser) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3821,7 +3821,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongUser) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongUserRestart) { +TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUserRestart) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3854,7 +3854,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongUserRestart) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPCacheURLCredentials) { +TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; @@ -3905,7 +3905,7 @@ TEST_F(URLRequestTestFTP, FLAKY_FTPCacheURLCredentials) { } // Flaky, see http://crbug.com/25045. -TEST_F(URLRequestTestFTP, FLAKY_FTPCacheLoginBoxCredentials) { +TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) { ASSERT_TRUE(test_server_.Start()); FilePath app_path; |