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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 14061024: Disable test CaptivePortalBrowserTest.NavigateLoadingTabToTimeoutTwoSites on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 90ac2b984ff303d5dffb6c0af9e35773f7752513..e4634a5b12f77741caaeca40702dde62e1c753b4 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1887,7 +1887,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
}
// Fails on Windows only, mostly on Win7. http://crbug.com/170033
-#if defined(OS_WIN)
+// Fails on Mac with assert. http://crbug.com/236118
+#if defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_NavigateLoadingTabToTimeoutTwoSites \
DISABLED_NavigateLoadingTabToTimeoutTwoSites
#else
« 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