summaryrefslogtreecommitdiffstats
path: root/chrome/browser/captive_portal
diff options
context:
space:
mode:
authorhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 05:57:26 +0000
committerhayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 05:57:26 +0000
commit83582dc4c0d894276dfa5fff14254c0c2c98926a (patch)
tree173fee93e286a0ba8b306a631f22cc47d6978987 /chrome/browser/captive_portal
parent753e1826fb3225bab638e9807013aec1de40dbd4 (diff)
downloadchromium_src-83582dc4c0d894276dfa5fff14254c0c2c98926a.zip
chromium_src-83582dc4c0d894276dfa5fff14254c0c2c98926a.tar.gz
chromium_src-83582dc4c0d894276dfa5fff14254c0c2c98926a.tar.bz2
WebKit gardening. Disable tests which started to fail on canary after r121912 of WebKit.
CaptivePortalBrowserTest.GoBackToTimeout MultipartResponseTest.SingleVisit ErrorPageTest.DNSError_GoBack2Forward2 ErrorPageTest.DNSError_GoBack2AndForward ErrorPageTest.DNSError_GoBack2 CaptivePortalBrowserTest.ReloadTimeout BUG=136310 TEST=None TBR=rafaelw Review URL: https://chromiumcodereview.appspot.com/10693118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/captive_portal')
-rw-r--r--chrome/browser/captive_portal/captive_portal_browsertest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 12a9d6c..5b9137e 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1710,7 +1710,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) {
}
// Checks that navigating back to a timeout triggers captive portal detection.
-IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) {
+// Disabled: http://crbug.com/136310
+IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_GoBackToTimeout) {
// Disable captive portal detection so the first navigation doesn't open a
// login tab.
EnableCaptivePortalDetection(browser()->profile(), false);
@@ -1767,7 +1768,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) {
// Checks that reloading a timeout triggers captive portal detection.
// Much like the last test, though the captive portal is disabled before
// the inital navigation, rather than captive portal detection.
-IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ReloadTimeout) {
+// Disabled: http://crbug.com/136310
+IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_ReloadTimeout) {
URLRequestMockCaptivePortalJobFactory::SetBehindCaptivePortal(false);
// Do the first navigation while not behind a captive portal.