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

Unified Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2482263004: Fix a possible flaky ServiceWorkerNavigationPreloadTest. (Closed)
Patch Set: s/reqeust/request/ Created 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 560e3b51d2b45b593306fbf4fcd283cd1f832b6c..58f3e9bb724e2a6fd27bfff13a6219479a20a6bc 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -1633,12 +1633,22 @@ IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, NetworkFallback) {
EXPECT_EQ(title, title_watcher.WaitAndGetTitle());
EXPECT_EQ("Hello world.", GetTextContent());
- // The page request must be sent twice. Once for navigation preload, and once
- // for fallback since respondWith wasn't used.
- ASSERT_EQ(2, GetRequestCount(kPageUrl));
- ASSERT_TRUE(HasNavigationPreloadHeader(request_log_[kPageUrl][0]));
- EXPECT_EQ("true", GetNavigationPreloadHeader(request_log_[kPageUrl][0]));
- EXPECT_FALSE(HasNavigationPreloadHeader(request_log_[kPageUrl][1]));
+ // The page request must be sent once or twice:
+ // - A navigation preload request may be sent. But it is possible that the
+ // navigation preload request is canceled before reaching the server.
+ // - A fallback request must be sent since respondWith wasn't used.
+ const int request_count = GetRequestCount(kPageUrl);
+ ASSERT_TRUE(request_count == 1 || request_count == 2);
+ if (request_count == 1) {
+ // Fallback request.
+ EXPECT_FALSE(HasNavigationPreloadHeader(request_log_[kPageUrl][0]));
+ } else if (request_count == 2) {
+ // Navigation preload request.
+ ASSERT_TRUE(HasNavigationPreloadHeader(request_log_[kPageUrl][0]));
+ EXPECT_EQ("true", GetNavigationPreloadHeader(request_log_[kPageUrl][0]));
+ // Fallback request.
+ EXPECT_FALSE(HasNavigationPreloadHeader(request_log_[kPageUrl][1]));
+ }
}
IN_PROC_BROWSER_TEST_P(ServiceWorkerNavigationPreloadTest, SetHeaderValue) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698