Skip to content

GitLab

T
tangled
Commit 389790dd authored by asargent's avatar asargent Committed by Commit bot
Browse files
Options

Disable ConditionalCacheDeletionHelperBrowserTest.TimeAndURL on linux 

The test has been flaky on Linux/ChromeOS.

TBR=msramek@chromium.org

BUG=624836

Review-Url: https://codereview.chromium.org/2569083002
Cr-Commit-Position: refs/heads/master@{#438113}
parent 632410c8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
View file @ 389790dd
...@@ -246,8 +246,9 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, Condition) { ...@@ -246,8 +246,9 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, Condition) {
// if those backends are slow. If this turns out to be a problem, consider // if those backends are slow. If this turns out to be a problem, consider
// increasing the |timeout_ms| constant. // increasing the |timeout_ms| constant.
// //
// Flakily timing out on Mac 10.11: https://crbug.com/646119 // Flakily timing out on Mac 10.11 (crbug.com/646119) and flakily
#if defined(OS_MACOSX) // failing on Linux/ChromeOS (crbug.com/624836).
#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_TimeAndURL DISABLED_TimeAndURL #define MAYBE_TimeAndURL DISABLED_TimeAndURL
#else #else
#define MAYBE_TimeAndURL TimeAndURL #define MAYBE_TimeAndURL TimeAndURL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment