Skip to content

GitLab

T
tangled
Commit 9f638bb8 authored by Giovanni Ortuño Urquidi's avatar Giovanni Ortuño Urquidi Committed by Commit Bot
Browse files
Options

sheriff: disable flaky timeouts in crash tests 

Flakes started again around:

https://ci.chromium.org/p/chromium/builders/ci/Win7%20Tests%20%28dbg%29%281%29/81647

TBR=avi@chromium.org

Bug: 985255
Change-Id: I1827cb12df13a490c8de00ae753c223d17c62f89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086458Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746666}
parent 69030ddf
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 3 deletions
chrome/browser/crash_recovery_browsertest.cc
View file @ 9f638bb8
...@@ -126,7 +126,14 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) { ...@@ -126,7 +126,14 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_Reload) {
} }
// Test that reload after a crash forces a cache revalidation. // Test that reload after a crash forces a cache revalidation.
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, ReloadCacheRevalidate) { //
// Flaky timeouts on Win7 Tests (dbg)(1); see https://crbug.com/985255.
#if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_ReloadCacheRevalidate DISABLED_ReloadCacheRevalidate
#else
#define MAYBE_ReloadCacheRevalidate ReloadCacheRevalidate
#endif
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_ReloadCacheRevalidate) {
const char kTestPath[] = "/test"; const char kTestPath[] = "/test";
// Use the test server so as not to bypass cache behavior. The title of the // Use the test server so as not to bypass cache behavior. The title of the
...@@ -188,7 +195,14 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) { ...@@ -188,7 +195,14 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_LoadInNewTab) {
// Tests that reloads of navigation errors behave correctly after a crash. // Tests that reloads of navigation errors behave correctly after a crash.
// Regression test for http://crbug.com/348918 // Regression test for http://crbug.com/348918
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) { //
// Flaky timeouts on Win7 Tests (dbg)(1); see https://crbug.com/985255.
#if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_DoubleReloadWithError DISABLED_DoubleReloadWithError
#else
#define MAYBE_DoubleReloadWithError DoubleReloadWithError
#endif
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_DoubleReloadWithError) {
GURL url(content::GetWebUIURL("bogus")); GURL url(content::GetWebUIURL("bogus"));
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL()); ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
...@@ -206,7 +220,14 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) { ...@@ -206,7 +220,14 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, DoubleReloadWithError) {
// Tests that a beforeunload handler doesn't run if user navigates to // Tests that a beforeunload handler doesn't run if user navigates to
// chrome::crash. // chrome::crash.
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, BeforeUnloadNotRun) { //
// Flaky timeouts on Win7 Tests (dbg)(1); see https://crbug.com/985255.
#if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_BeforeUnloadNotRun DISABLED_BeforeUnloadNotRun
#else
#define MAYBE_BeforeUnloadNotRun BeforeUnloadNotRun
#endif
IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, MAYBE_BeforeUnloadNotRun) {
const char* kBeforeUnloadHTML = const char* kBeforeUnloadHTML =
"<html><body>" "<html><body>"
"<script>window.onbeforeunload=function(e){return 'foo'}</script>" "<script>window.onbeforeunload=function(e){return 'foo'}</script>"
......
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