diff options
author | tyoshino@google.com <tyoshino@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 03:51:33 +0000 |
---|---|---|
committer | tyoshino@google.com <tyoshino@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 03:51:33 +0000 |
commit | d3c3274426c2f6b9f1796cda6d5b4466237cfaf7 (patch) | |
tree | 764b99016975d8c56a44b58d3de3398381c32e73 /net/url_request/url_request_unittest.cc | |
parent | 48e144ee5faf657841f2051f9a94b46b8a96fc89 (diff) | |
download | chromium_src-d3c3274426c2f6b9f1796cda6d5b4466237cfaf7.zip chromium_src-d3c3274426c2f6b9f1796cda6d5b4466237cfaf7.tar.gz chromium_src-d3c3274426c2f6b9f1796cda6d5b4466237cfaf7.tar.bz2 |
Reverting 26419.
Looks like this CL caused failure in Modules Linux (valgrind)
http://chrome-buildbot.corp.google.com:8010/builders/Modules%20Linux%20(valgrind)/builds/1104/steps/valgrind%20test:%20base/logs/stdio
http://chrome-buildbot.corp.google.com:8010/builders/Modules%20Linux%20(valgrind)/builds/1103/steps/valgrind%20test:%20base/logs/stdio
[----------] 6 tests from ClipboardTest
[ RUN ] ClipboardTest.ClearTest
command timed out: 1200 seconds without output, killing pid 7479
process killed by signal 9
program finished with exit code -1
TBR=phajdan.jr
Review URL: http://codereview.chromium.org/212007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_unittest.cc')
-rw-r--r-- | net/url_request/url_request_unittest.cc | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 0926c30..d82e085 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -2123,99 +2123,3 @@ TEST_F(URLRequestTestFTP, FTPCheckWrongUserRestart) { EXPECT_EQ(d.bytes_received(), static_cast<int>(file_size)); } } - -TEST_F(URLRequestTestFTP, FTPCacheURLCredentials) { - ASSERT_TRUE(NULL != server_.get()); - FilePath app_path; - PathService::Get(base::DIR_SOURCE_ROOT, &app_path); - app_path = app_path.AppendASCII("LICENSE"); - - scoped_ptr<TestDelegate> d(new TestDelegate); - { - // Pass correct login identity in the URL. - TestURLRequest r(server_->TestServerPage("/LICENSE", - "chrome", "chrome"), - d.get()); - r.Start(); - EXPECT_TRUE(r.is_pending()); - - MessageLoop::current()->Run(); - - int64 file_size = 0; - file_util::GetFileSize(app_path, &file_size); - - EXPECT_FALSE(r.is_pending()); - EXPECT_EQ(1, d->response_started_count()); - EXPECT_FALSE(d->received_data_before_response()); - EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); - } - - d.reset(new TestDelegate); - { - // This request should use cached identity from previous request. - TestURLRequest r(server_->TestServerPage("/LICENSE"), d.get()); - r.Start(); - EXPECT_TRUE(r.is_pending()); - - MessageLoop::current()->Run(); - - int64 file_size = 0; - file_util::GetFileSize(app_path, &file_size); - - EXPECT_FALSE(r.is_pending()); - EXPECT_EQ(1, d->response_started_count()); - EXPECT_FALSE(d->received_data_before_response()); - EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); - } -} - -TEST_F(URLRequestTestFTP, FTPCacheLoginBoxCredentials) { - ASSERT_TRUE(NULL != server_.get()); - FilePath app_path; - PathService::Get(base::DIR_SOURCE_ROOT, &app_path); - app_path = app_path.AppendASCII("LICENSE"); - - scoped_ptr<TestDelegate> d(new TestDelegate); - // Set correct login credentials. The delegate will be asked for them when - // the initial login with wrong credentials will fail. - d->set_username(L"chrome"); - d->set_password(L"chrome"); - { - TestURLRequest r(server_->TestServerPage("/LICENSE", - "chrome", "wrong_password"), - d.get()); - r.Start(); - EXPECT_TRUE(r.is_pending()); - - MessageLoop::current()->Run(); - - int64 file_size = 0; - file_util::GetFileSize(app_path, &file_size); - - EXPECT_FALSE(r.is_pending()); - EXPECT_EQ(1, d->response_started_count()); - EXPECT_FALSE(d->received_data_before_response()); - EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); - } - - // Use a new delegate without explicit credentials. The cached ones should be - // used. - d.reset(new TestDelegate); - { - // Don't pass wrong credentials in the URL, they would override valid cached - // ones. - TestURLRequest r(server_->TestServerPage("/LICENSE"), d.get()); - r.Start(); - EXPECT_TRUE(r.is_pending()); - - MessageLoop::current()->Run(); - - int64 file_size = 0; - file_util::GetFileSize(app_path, &file_size); - - EXPECT_FALSE(r.is_pending()); - EXPECT_EQ(1, d->response_started_count()); - EXPECT_FALSE(d->received_data_before_response()); - EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size)); - } -} |