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

Unified Diff: chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc

Issue 2332003003: Disable flaky ConditionalCacheDeletionHelperBrowserTest.TimeAndURL on mac. (Closed)
Patch Set: Created 4 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
« 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: chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
diff --git a/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc b/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
index 4e705be4b6c81bb9a7678f81fb320ebf7ae0dad6..4fec4646bc76d041cc33fe12926bfd2d881552a7 100644
--- a/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
@@ -245,7 +245,15 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, Condition) {
// Note: This test depends on the timing in cache backends and can be flaky
// if those backends are slow. If this turns out to be a problem, consider
// increasing the |timeout_ms| constant.
-IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, TimeAndURL) {
+//
+// Flakily timing out on Mac 10.11: https://crbug.com/646119
+#if defined(OS_MACOSX)
+#define MAYBE_TimeAndURL DISABLED_TimeAndURL
+#else
+#define MAYBE_TimeAndURL TimeAndURL
+#endif
+IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest,
+ MAYBE_TimeAndURL) {
const int64_t timeout_ms = 1;
// Create some entries.
« 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