diff options
| author | nasko <nasko@chromium.org> | 2015-01-30 11:19:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 19:20:31 +0000 |
| commit | 3d1eef54030dae8de57ccd500b3fa247b828bf4e (patch) | |
| tree | 0d846e33f7725f310ff2bb76b6282dba63cc0207 | |
| parent | f8b5a008894b9b5c985c3d7ae2d222910be66bc8 (diff) | |
| download | chromium_src-3d1eef54030dae8de57ccd500b3fa247b828bf4e.zip chromium_src-3d1eef54030dae8de57ccd500b3fa247b828bf4e.tar.gz chromium_src-3d1eef54030dae8de57ccd500b3fa247b828bf4e.tar.bz2 | |
Disable CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading
BUG=453875
TBR=thestig@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/868203004
Cr-Commit-Position: refs/heads/master@{#313961}
| -rw-r--r-- | chrome/browser/captive_portal/captive_portal_browsertest.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 7fd8389..ad2345c 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -2126,10 +2126,20 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GetStateOfTabReloaderAt(browser(), 0)); } +// This test is very flaky on Linux and is disabled. +// https://crbug.com/453875 +#if defined(OS_LINUX) +#define MAYBE_InterstitialTimerNavigateAwayWhileLoading \ + DISABLED_InterstitialTimerNavigateAwayWhileLoading +#else +#define MAYBE_InterstitialTimerNavigateAwayWhileLoading \ + InterstitialTimerNavigateAwayWhileLoading +#endif + // Same as above, but instead of reloading, the page is navigated away. The new // page should load, and no interstitials should be shown. IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, - InterstitialTimerNavigateAwayWhileLoading) { + MAYBE_InterstitialTimerNavigateAwayWhileLoading) { net::SpawnedTestServer::SSLOptions https_options; https_options.server_certificate = net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME; |