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

Unified Diff: content/network/url_loader_unittest.cc

Issue 2919413003: Fix network service hanging with empty bodies. (Closed)
Patch Set: review comments Created 3 years, 6 months 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 | « content/network/url_loader_impl.cc ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/network/url_loader_unittest.cc
diff --git a/content/network/url_loader_unittest.cc b/content/network/url_loader_unittest.cc
index 69af3fd82592f1bd4aaad698fa1c5ec380acdc00..e79180824932a11fb1bef3a53972768918f8b10a 100644
--- a/content/network/url_loader_unittest.cc
+++ b/content/network/url_loader_unittest.cc
@@ -44,8 +44,13 @@ static ResourceRequest CreateResourceRequest(const char* method,
}
std::string ReadData(MojoHandle consumer, size_t size) {
- CHECK_EQ(mojo::Wait(mojo::Handle(consumer), MOJO_HANDLE_SIGNAL_READABLE),
- MOJO_RESULT_OK);
+ MojoResult rv =
+ mojo::Wait(mojo::Handle(consumer), MOJO_HANDLE_SIGNAL_READABLE);
+ if (!size) {
+ CHECK_EQ(rv, MOJO_RESULT_FAILED_PRECONDITION);
+ return std::string();
+ }
+ CHECK_EQ(rv, MOJO_RESULT_OK);
std::vector<char> buffer(size);
uint32_t num_bytes = static_cast<uint32_t>(size);
CHECK_EQ(MojoReadData(consumer, buffer.data(), &num_bytes,
@@ -116,6 +121,10 @@ TEST_F(URLLoaderImplTest, Basic) {
LoadAndCompareFile("simple_page.html");
}
+TEST_F(URLLoaderImplTest, Empty) {
+ LoadAndCompareFile("empty.html");
+}
+
TEST_F(URLLoaderImplTest, BasicSSL) {
net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
https_server.ServeFilesFromSourceDirectory(
« no previous file with comments | « content/network/url_loader_impl.cc ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698