summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Cameron <ccameron@chromium.org>2015-02-04 15:29:28 -0800
committerChristopher Cameron <ccameron@chromium.org>2015-02-04 23:33:26 +0000
commited26438c461023e27494f2040b52556b4385bf40 (patch)
tree7397cbf82c53aa50ab149899378c7526ebbb87cc
parent10a45b9048e77944987d387b0eff3b5fcfd7a0bc (diff)
downloadchromium_src-ed26438c461023e27494f2040b52556b4385bf40.zip
chromium_src-ed26438c461023e27494f2040b52556b4385bf40.tar.gz
chromium_src-ed26438c461023e27494f2040b52556b4385bf40.tar.bz2
Disable CaptivePortalBrowserTest.InterstitialTimerReloadWhileLoading
CaptivePortalBrowserTest.InterstitialTimerNavigateAwayWhileLoading was disabled a few days ago, this one has the same issue. BUG=453875 TBR=thestig@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/902583005 Cr-Commit-Position: refs/heads/master@{#314676}
-rw-r--r--chrome/browser/captive_portal/captive_portal_browsertest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index ad2345c..5adb086 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -2070,10 +2070,19 @@ 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_InterstitialTimerReloadWhileLoading \
+ DISABLED_InterstitialTimerReloadWhileLoading
+#else
+#define MAYBE_InterstitialTimerReloadWhileLoading \
+ InterstitialTimerReloadWhileLoading
+#endif
// Same as above, but instead of stopping, the loading page is reloaded. The end
// result is the same. (i.e. page load stops, no interstitials shown)
IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
- InterstitialTimerReloadWhileLoading) {
+ MAYBE_InterstitialTimerReloadWhileLoading) {
net::SpawnedTestServer::SSLOptions https_options;
https_options.server_certificate =
net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME;