[Net] Fix error handling on wrong file in UploadData
* Handle file error as a failure rather than handling it as empty file.
* Change Chrome Frame error handling for URLRequest failure, from DCHECK hit to ignoring failing input file.
BUG=310548, 317432
Review URL: https://codereview.chromium.org/39203004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234436 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 780d147..f58f64b 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -12,6 +12,7 @@
#include "base/memory/scoped_vector.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
+#include "base/test/test_file_util.h"
#include "net/base/auth.h"
#include "net/base/net_log_unittest.h"
#include "net/base/request_priority.h"
@@ -459,6 +460,33 @@
return google_post_request_;
}
+ const HttpRequestInfo& CreateUnreadableFilePostRequest() {
+ if (google_post_request_initialized_)
+ return google_post_request_;
+
+ base::FilePath file_path;
+ CHECK(file_util::CreateTemporaryFileInDir(temp_dir_.path(), &file_path));
+ CHECK_EQ(static_cast<int>(kUploadDataSize),
+ file_util::WriteFile(file_path, kUploadData, kUploadDataSize));
+ CHECK(file_util::MakeFileUnreadable(file_path));
+
+ ScopedVector<UploadElementReader> element_readers;
+ element_readers.push_back(
+ new UploadFileElementReader(base::MessageLoopProxy::current().get(),
+ file_path,
+ 0,
+ kUploadDataSize,
+ base::Time()));
+ upload_data_stream_.reset(
+ new UploadDataStream(element_readers.Pass(), 0));
+
+ google_post_request_.method = "POST";
+ google_post_request_.url = GURL(kDefaultURL);
+ google_post_request_.upload_data_stream = upload_data_stream_.get();
+ google_post_request_initialized_ = true;
+ return google_post_request_;
+ }
+
const HttpRequestInfo& CreateComplexPostRequest() {
if (!google_post_request_initialized_) {
const int kFileRangeOffset = 1;
@@ -1785,6 +1813,28 @@
EXPECT_EQ("hello!", out.response_data);
}
+// Test that a POST with a unreadable file fails.
+TEST_P(SpdyNetworkTransactionTest, UnreadableFilePost) {
+ MockWrite writes[] = {
+ MockWrite(ASYNC, 0, 0) // EOF
+ };
+ MockRead reads[] = {
+ MockRead(ASYNC, 0, 0) // EOF
+ };
+
+ DelayedSocketData data(1, reads, arraysize(reads), writes, arraysize(writes));
+ NormalSpdyTransactionHelper helper(CreateUnreadableFilePostRequest(),
+ DEFAULT_PRIORITY,
+ BoundNetLog(), GetParam(), NULL);
+ helper.RunPreTestSetup();
+ helper.AddData(&data);
+ helper.RunDefaultTest();
+
+ base::RunLoop().RunUntilIdle();
+ helper.VerifyDataNotConsumed();
+ EXPECT_EQ(ERR_ACCESS_DENIED, helper.output().rv);
+}
+
// Test that a complex POST works.
TEST_P(SpdyNetworkTransactionTest, ComplexPost) {
scoped_ptr<SpdyFrame> req(
