summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 08:26:09 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 08:26:09 +0000
commitebaf26ce325e21df4619ab95cc0399bc88f30d05 (patch)
tree4e5e50eedf1d5188b324b32c93f51e1eafad0a42 /chrome
parent320948e09f9a2c2fd449fe00a630cb1b8a4d78a5 (diff)
downloadchromium_src-ebaf26ce325e21df4619ab95cc0399bc88f30d05.zip
chromium_src-ebaf26ce325e21df4619ab95cc0399bc88f30d05.tar.gz
chromium_src-ebaf26ce325e21df4619ab95cc0399bc88f30d05.tar.bz2
Disable SSLUITest.TestCNInvalidStickiness, flakily hits an assertion.
TBR=rsleevi BUG=68448, 49377 TEST=browser_tests Review URL: http://codereview.chromium.org/6178005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 0e6b44a..a129544 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -660,16 +660,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsCachedInsecureContent) {
CheckAuthenticationBrokenState(tab, 0, true, false);
}
-#if defined(OS_WIN)
-// See http://crbug.com/47170
-#define MAYBE_TestCNInvalidStickiness FLAKY_TestCNInvalidStickiness
-#else
-#define MAYBE_TestCNInvalidStickiness TestCNInvalidStickiness
-#endif
-
// This test ensures the CN invalid status does not 'stick' to a certificate
// (see bug #1044942) and that it depends on the host-name.
-IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestCNInvalidStickiness) {
+// Disabled, see http://crbug.com/68448 and http://crbug.com/49377.
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) {
ASSERT_TRUE(https_server_.Start());
ASSERT_TRUE(https_server_mismatched_.Start());