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

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 11876040: Disable flaky CaptivePortalBrowserTest on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index a6632d47e3200b6f825ca96c264382e7a232c41b..9fcc6c3685a15db9f4cd153cf209a47782f68444 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1894,10 +1894,19 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
GURL(kMockHttpsUrl));
}
+// Fails on Windows only, mostly on Win7. http://crbug.com/170033
+#if defined(OS_WIN)
+#define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
+ DISABLED_NavigateLoadingTabToTimeoutTwoSites
+#else
+#define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
+ NavigateLoadingTabToTimeoutTwoSites
+#endif
+
// Checks that captive portal detection triggers correctly when a same-site
// navigation is cancelled by a navigation to another site.
IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
- NavigateLoadingTabToTimeoutTwoSites) {
+ MAYBE_NavigateLoadingTabToTimeoutTwoSites) {
RunNavigateLoadingTabToTimeoutTest(
browser(),
GURL(kMockHttpsUrl),
« 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