summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 19:58:15 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 19:58:15 +0000
commitcde4e80d78fee0902c0290b2c2a4052e1e7132cd (patch)
tree20b80c971534469c21c0082ef93a3fb1f7a7623b /net/url_request/url_request_unittest.cc
parent89ee20457b8700a2616823e147aaa28287bd7d20 (diff)
downloadchromium_src-cde4e80d78fee0902c0290b2c2a4052e1e7132cd.zip
chromium_src-cde4e80d78fee0902c0290b2c2a4052e1e7132cd.tar.gz
chromium_src-cde4e80d78fee0902c0290b2c2a4052e1e7132cd.tar.bz2
Mark flaky FTP tests as flaky.
TEST=none BUG=25045 Review URL: http://codereview.chromium.org/284013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_unittest.cc')
-rw-r--r--net/url_request/url_request_unittest.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 07caaac..a9a5b0a 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1962,7 +1962,8 @@ class URLRequestTestFTP : public URLRequestTest {
// static
scoped_refptr<FTPTestServer> URLRequestTestFTP::server_;
-TEST_F(URLRequestTestFTP, FTPDirectoryListing) {
+// Flaky, see http://crbug.com/25045.
+TEST_F(URLRequestTestFTP, FLAKY_FTPDirectoryListing) {
ASSERT_TRUE(NULL != server_.get());
TestDelegate d;
{
@@ -2050,7 +2051,8 @@ TEST_F(URLRequestTestFTP, FTPCheckWrongPassword) {
}
}
-TEST_F(URLRequestTestFTP, FTPCheckWrongPasswordRestart) {
+// Flaky, see http://crbug.com/25045.
+TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongPasswordRestart) {
ASSERT_TRUE(NULL != server_.get());
FilePath app_path;
PathService::Get(base::DIR_SOURCE_ROOT, &app_path);
@@ -2102,7 +2104,8 @@ TEST_F(URLRequestTestFTP, FTPCheckWrongUser) {
}
}
-TEST_F(URLRequestTestFTP, FTPCheckWrongUserRestart) {
+// Flaky, see http://crbug.com/25045.
+TEST_F(URLRequestTestFTP, FLAKY_FTPCheckWrongUserRestart) {
ASSERT_TRUE(NULL != server_.get());
FilePath app_path;
PathService::Get(base::DIR_SOURCE_ROOT, &app_path);
@@ -2130,7 +2133,8 @@ TEST_F(URLRequestTestFTP, FTPCheckWrongUserRestart) {
}
}
-TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) {
+// Flaky, see http://crbug.com/25045.
+TEST_F(URLRequestTestFTP, FLAKY_FTPCacheURLCredentials) {
ASSERT_TRUE(NULL != server_.get());
FilePath app_path;
PathService::Get(base::DIR_SOURCE_ROOT, &app_path);
@@ -2175,7 +2179,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) {
}
}
-TEST_F(URLRequestTestFTP, FTPCacheLoginBoxCredentials) {
+// Flaky, see http://crbug.com/25045.
+TEST_F(URLRequestTestFTP, FLAKY_FTPCacheLoginBoxCredentials) {
ASSERT_TRUE(NULL != server_.get());
FilePath app_path;
PathService::Get(base::DIR_SOURCE_ROOT, &app_path);