Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Unified Diff: net/url_request/url_request_unittest.cc

Issue 39203004: [Net] Fix error handling on wrong file in UploadData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index daf4c575ede70d36c56bc01d6716c7b58a4768a9..3cab09b4368afaffa7f5b0db2f43c10c4a8e749d 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -4655,15 +4655,6 @@ TEST_F(URLRequestTestHTTP, PostFileTest) {
0,
kuint64max,
base::Time()));
-
- // This file should just be ignored in the upload stream.
- element_readers.push_back(new UploadFileElementReader(
- base::MessageLoopProxy::current().get(),
- base::FilePath(FILE_PATH_LITERAL(
- "c:\\path\\to\\non\\existant\\file.randomness.12345")),
- 0,
- kuint64max,
- base::Time()));
r.set_upload(make_scoped_ptr(
new UploadDataStream(element_readers.Pass(), 0)));
@@ -4689,6 +4680,50 @@ TEST_F(URLRequestTestHTTP, PostFileTest) {
}
}
+TEST_F(URLRequestTestHTTP, PostUnreadableFileTest) {
+ ASSERT_TRUE(test_server_.Start());
+
+ TestDelegate d;
+ {
+ URLRequest r(test_server_.GetURL("echo"), DEFAULT_PRIORITY,
+ &d, &default_context_);
+ r.set_method("POST");
+
+ ScopedVector<UploadElementReader> element_readers;
+
+ element_readers.push_back(new UploadFileElementReader(
+ base::MessageLoopProxy::current().get(),
+ base::FilePath(FILE_PATH_LITERAL(
+ "c:\\path\\to\\non\\existant\\file.randomness.12345")),
+ 0,
+ kuint64max,
+ base::Time()));
+ r.set_upload(make_scoped_ptr(
+ new UploadDataStream(element_readers.Pass(), 0)));
+
+ r.Start();
+ EXPECT_TRUE(r.is_pending());
+
+ base::RunLoop().Run();
+
+ // TODO(tzik): Remove this #if after we stop supporting Chrome Frame.
+ // http://crbug.com/317432
+#if defined(CHROME_FRAME_NET_TESTS)
+ EXPECT_FALSE(d.request_failed());
+ EXPECT_FALSE(d.received_data_before_response());
+ EXPECT_EQ(0, d.bytes_received());
+ EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status());
+ EXPECT_EQ(OK, r.status().error());
+#else
+ EXPECT_TRUE(d.request_failed());
+ EXPECT_FALSE(d.received_data_before_response());
+ EXPECT_EQ(0, d.bytes_received());
+ EXPECT_EQ(URLRequestStatus::FAILED, r.status().status());
+ EXPECT_EQ(ERR_FILE_NOT_FOUND, r.status().error());
+#endif // defined(CHROME_FRAME_NET_TESTS)
+ }
+}
+
TEST_F(URLRequestTestHTTP, TestPostChunkedDataBeforeStart) {
ASSERT_TRUE(test_server_.Start());
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698