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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ssl/captive_portal_blocking_page.h" 5 #include "chrome/browser/ssl/captive_portal_blocking_page.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 } 288 }
289 289
290 // If the connection is a Wi-Fi connection, the Wi-Fi version of the captive 290 // If the connection is a Wi-Fi connection, the Wi-Fi version of the captive
291 // portal interstitial should be displayed. 291 // portal interstitial should be displayed.
292 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest, 292 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
293 WiFi_SSID_LoginURL) { 293 WiFi_SSID_LoginURL) {
294 TestInterstitial(true, kWiFiSSID, GURL("http://captive.portal/landing_url"), 294 TestInterstitial(true, kWiFiSSID, GURL("http://captive.portal/landing_url"),
295 EXPECT_WIFI_YES, EXPECT_WIFI_SSID_YES, EXPECT_LOGIN_URL_YES); 295 EXPECT_WIFI_YES, EXPECT_WIFI_SSID_YES, EXPECT_LOGIN_URL_YES);
296 } 296 }
297 297
298 // Flaky on mac: https://crbug.com/690170
299 #if defined(OS_MACOSX)
300 #define MAYBE_WiFi_NoSSID_LoginURL DISABLED_WiFi_NoSSID_LoginURL
301 #else
302 #define MAYBE_WiFi_NoSSID_LoginURL WiFi_NoSSID_LoginURL
303 #endif
304
298 // Same as above, with login URL but no SSID. 305 // Same as above, with login URL but no SSID.
299 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest, 306 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
300 WiFi_NoSSID_LoginURL) { 307 MAYBE_WiFi_NoSSID_LoginURL) {
301 TestInterstitial(true, std::string(), 308 TestInterstitial(true, std::string(),
302 GURL("http://captive.portal/landing_url"), EXPECT_WIFI_YES, 309 GURL("http://captive.portal/landing_url"), EXPECT_WIFI_YES,
303 EXPECT_WIFI_SSID_NO, EXPECT_LOGIN_URL_YES); 310 EXPECT_WIFI_SSID_NO, EXPECT_LOGIN_URL_YES);
304 } 311 }
305 312
313 // Flaky on mac: https://crbug.com/690125
314 #if defined(OS_MACOSX)
315 #define MAYBE_WiFi_SSID_NoLoginURL DISABLED_WiFi_SSID_NoLoginURL
316 #else
317 #define MAYBE_WiFi_SSID_NoLoginURL WiFi_SSID_NoLoginURL
318 #endif
319
306 // Same as above, with SSID but no login URL. 320 // Same as above, with SSID but no login URL.
307 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest, 321 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
308 WiFi_SSID_NoLoginURL) { 322 MAYBE_WiFi_SSID_NoLoginURL) {
309 const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL); 323 const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
310 TestInterstitial(true, kWiFiSSID, kLandingUrl, 324 TestInterstitial(true, kWiFiSSID, kLandingUrl,
311 EXPECT_WIFI_YES, EXPECT_WIFI_SSID_YES, EXPECT_LOGIN_URL_NO); 325 EXPECT_WIFI_YES, EXPECT_WIFI_SSID_YES, EXPECT_LOGIN_URL_NO);
312 } 326 }
313 327
314 // Same as above, with no SSID and no login URL. 328 // Same as above, with no SSID and no login URL.
315 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest, 329 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
316 WiFi_NoSSID_NoLoginURL) { 330 WiFi_NoSSID_NoLoginURL) {
317 const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL); 331 const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
318 TestInterstitial(true, std::string(), kLandingUrl, EXPECT_WIFI_YES, 332 TestInterstitial(true, std::string(), kLandingUrl, EXPECT_WIFI_YES,
(...skipping 25 matching lines...) Expand all
344 false, ""); 358 false, "");
345 return blocking_page; 359 return blocking_page;
346 } 360 }
347 }; 361 };
348 362
349 // Test that an IDN login domain is decoded properly. 363 // Test that an IDN login domain is decoded properly.
350 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest, 364 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageIDNTest,
351 ShowLoginIDNIfPortalRedirectsDetectionURL) { 365 ShowLoginIDNIfPortalRedirectsDetectionURL) {
352 EXPECT_TRUE(VerifyIDNDecoded()); 366 EXPECT_TRUE(VerifyIDNDecoded());
353 } 367 }
OLDNEW
« 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