diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 19:26:00 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 19:26:00 +0000 |
| commit | 086eaec4d8ed6b6207925253f17fdabef82a0ed7 (patch) | |
| tree | 28916c1bd003d7e156df2998e7f7943f42c62298 /net | |
| parent | 8030dc7cd3c72e709cdee0b7b3276fb483d63e62 (diff) | |
| download | chromium_src-086eaec4d8ed6b6207925253f17fdabef82a0ed7.zip chromium_src-086eaec4d8ed6b6207925253f17fdabef82a0ed7.tar.gz chromium_src-086eaec4d8ed6b6207925253f17fdabef82a0ed7.tar.bz2 | |
Re-enable remaining FTP unit tests.
Also, use NotifyDone in URLRequestNewFtpJob instead of NotifyStartError. This way is_pending in URLRequest is correctly reset to false.
TEST=Covered by net_unittests.
http://crbug.com/18036
Review URL: http://codereview.chromium.org/165142
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request_new_ftp_job.cc | 2 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/url_request/url_request_new_ftp_job.cc b/net/url_request/url_request_new_ftp_job.cc index fd34945..72aee4d 100644 --- a/net/url_request/url_request_new_ftp_job.cc +++ b/net/url_request/url_request_new_ftp_job.cc @@ -246,7 +246,7 @@ void URLRequestNewFtpJob::OnStartCompleted(int result) { if (result == net::OK) { NotifyHeadersComplete(); } else { - NotifyStartError(URLRequestStatus(URLRequestStatus::FAILED, result)); + NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, result)); } } diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 5a5af4a..50b647c 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -1857,8 +1857,7 @@ TEST_F(URLRequestTest, FTPGetTest) { } } -// Needs more work, tracked in http://crbug.com/18036. -TEST_F(URLRequestTest, DISABLED_FTPCheckWrongPassword) { +TEST_F(URLRequestTest, FTPCheckWrongPassword) { scoped_refptr<FTPTestServer> server = FTPTestServer::CreateServer(L"", "chrome", "wrong_password"); ASSERT_TRUE(NULL != server.get()); @@ -1883,8 +1882,7 @@ TEST_F(URLRequestTest, DISABLED_FTPCheckWrongPassword) { } } -// Needs more work, tracked in http://crbug.com/18036. -TEST_F(URLRequestTest, DISABLED_FTPCheckWrongUser) { +TEST_F(URLRequestTest, FTPCheckWrongUser) { scoped_refptr<FTPTestServer> server = FTPTestServer::CreateServer(L"", "wrong_user", "chrome"); ASSERT_TRUE(NULL != server.get()); |