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

Unified Diff: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

Issue 2681413003: Disable flaky CaptivePortalBlockingPageTest tests on Mac (Closed)
Patch Set: Created 3 years, 10 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/ssl/captive_portal_blocking_page_browsertest.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
index 4d0a9d153ab1eee6f5699d87aca285cb4f65cff8..4b93c4392825848a009dfd8c69723f9ae20abc13 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -295,17 +295,31 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
EXPECT_WIFI_YES, EXPECT_WIFI_SSID_YES, EXPECT_LOGIN_URL_YES);
}
+// Flaky on mac: https://crbug.com/690170
+#if defined(OS_MACOSX)
+#define MAYBE_WiFi_NoSSID_LoginURL DISABLED_WiFi_NoSSID_LoginURL
+#else
+#define MAYBE_WiFi_NoSSID_LoginURL WiFi_NoSSID_LoginURL
+#endif
+
// Same as above, with login URL but no SSID.
IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
- WiFi_NoSSID_LoginURL) {
+ MAYBE_WiFi_NoSSID_LoginURL) {
TestInterstitial(true, std::string(),
GURL("http://captive.portal/landing_url"), EXPECT_WIFI_YES,
EXPECT_WIFI_SSID_NO, EXPECT_LOGIN_URL_YES);
}
+// Flaky on mac: https://crbug.com/690125
+#if defined(OS_MACOSX)
+#define MAYBE_WiFi_SSID_NoLoginURL DISABLED_WiFi_SSID_NoLoginURL
+#else
+#define MAYBE_WiFi_SSID_NoLoginURL WiFi_SSID_NoLoginURL
+#endif
+
// Same as above, with SSID but no login URL.
IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
- WiFi_SSID_NoLoginURL) {
+ MAYBE_WiFi_SSID_NoLoginURL) {
const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
TestInterstitial(true, kWiFiSSID, kLandingUrl,
EXPECT_WIFI_YES, EXPECT_WIFI_SSID_YES, EXPECT_LOGIN_URL_NO);
« 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