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

Unified Diff: net/url_request/url_request_unittest.cc

Issue 23710059: Release the cache entry on deferred redirect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable new tests on Chrome Frame Created 7 years, 3 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
« net/url_request/url_request_job.cc ('K') | « net/url_request/url_request_job.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 c1178fe04dadabfd1d6b46e6cb670bddf5c8a4ab..06b78e9c0ce61fde24f9224083f82b5a67654bcd 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -4203,6 +4203,39 @@ TEST_F(URLRequestTestHTTP, EmptyReferrerAfterValidReferrer) {
EXPECT_EQ(std::string("None"), d.data_received());
}
+TEST_F(URLRequestTestHTTP, CachedRedirect) {
rvargas (doing something else) 2013/09/17 19:53:25 I would have gone for an URLRequestJob unit test..
davidben 2013/09/17 22:16:04 Done.
+ ASSERT_TRUE(test_server_.Start());
+
+ // Write to the cache.
+ {
+ TestDelegate d;
+ GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+ URLRequest req(test_url, &d, &default_context_);
+
+ req.Start();
+ base::RunLoop().Run();
+
+ EXPECT_EQ(1, d.received_redirect_count());
+ EXPECT_EQ(1, d.response_started_count());
+ EXPECT_FALSE(d.received_data_before_response());
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());
+ }
+
+ // Stop at the redirect and make sure it was read from cache.
+ {
+ TestDelegate d;
+ d.set_quit_on_redirect(true);
+ GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+ URLRequest req(test_url, &d, &default_context_);
+
+ req.Start();
+ base::RunLoop().Run();
+
+ EXPECT_EQ(1, d.received_redirect_count());
+ EXPECT_TRUE(req.was_cached());
+ }
+}
+
TEST_F(URLRequestTestHTTP, CancelRedirect) {
ASSERT_TRUE(test_server_.Start());
@@ -4297,6 +4330,59 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect_GetFullRequestHeaders) {
}
}
+// Tests that a deferred redirect releases its lock on the cache.
+TEST_F(URLRequestTestHTTP, DeferredRedirect_ReleaseCacheEntry) {
+ ASSERT_TRUE(test_server_.Start());
+
+ // First test the cold cache case.
+ {
+ // First, fire a request and (indefinitely) pause its redirect.
+ TestDelegate pausing_delegate;
+ pausing_delegate.set_quit_on_redirect(true);
+ GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+ URLRequest paused_req(test_url, &pausing_delegate, &default_context_);
+ paused_req.Start();
+ base::RunLoop().Run();
+ EXPECT_EQ(1, pausing_delegate.received_redirect_count());
+
+ // This should test the cold cache case.
+ EXPECT_FALSE(paused_req.was_cached());
+
+ // Now, fire a second at the same. It should not get stuck.
+ TestDelegate delegate;
+ URLRequest req(test_url, &delegate, &default_context_);
+ req.Start();
+ base::RunLoop().Run();
+ EXPECT_EQ(1, delegate.response_started_count());
+ EXPECT_FALSE(delegate.received_data_before_response());
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());
+ }
+
+ // Repeat, now with the cache warmed from the last run.
+ {
+ // First, fire a request and (indefinitely) pause its redirect.
+ TestDelegate pausing_delegate;
+ pausing_delegate.set_quit_on_redirect(true);
+ GURL test_url(test_server_.GetURL("files/redirect-test.html"));
+ URLRequest paused_req(test_url, &pausing_delegate, &default_context_);
+ paused_req.Start();
+ base::RunLoop().Run();
+ EXPECT_EQ(1, pausing_delegate.received_redirect_count());
+
+ // This should test the cold cache case.
+ EXPECT_TRUE(paused_req.was_cached());
+
+ // Now, fire a second at the same. It should not get stuck.
+ TestDelegate delegate;
+ URLRequest req(test_url, &delegate, &default_context_);
+ req.Start();
+ base::RunLoop().Run();
+ EXPECT_EQ(1, delegate.response_started_count());
+ EXPECT_FALSE(delegate.received_data_before_response());
+ EXPECT_EQ(URLRequestStatus::SUCCESS, req.status().status());
+ }
+}
+
TEST_F(URLRequestTestHTTP, CancelDeferredRedirect) {
ASSERT_TRUE(test_server_.Start());
« net/url_request/url_request_job.cc ('K') | « net/url_request/url_request_job.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698