summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 19:30:32 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 19:30:32 +0000
commit6c1d2994c9472e09336d08a496d54332256dcc22 (patch)
tree5efa5f121da6b125e6c78908c685e50384763efa
parent5a0af9a75739431456bc0680c5f5625ee405c5b2 (diff)
downloadchromium_src-6c1d2994c9472e09336d08a496d54332256dcc22.zip
chromium_src-6c1d2994c9472e09336d08a496d54332256dcc22.tar.gz
chromium_src-6c1d2994c9472e09336d08a496d54332256dcc22.tar.bz2
Disable CaptivePortalBrowserTest.TwoWindows, as it's
slightly flaky on all platforms. TBR=cbentzel@chromium.org BUG=134357 Review URL: https://chromiumcodereview.appspot.com/10697008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144515 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/captive_portal/captive_portal_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index de6c359..0f44c53 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1734,7 +1734,8 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ReloadTimeout) {
// Checks the case where there are two windows, and there's an SSL timeout in
// the background one.
-IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, TwoWindows) {
+// Disabled: http://crbug.com/134357
+IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) {
Browser* browser2 = Browser::Create(browser()->profile());
// Navigate the new browser window so it'll be shown and we can pick the
// active window.