summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 22:18:17 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 22:18:17 +0000
commit695e0d4c84455f13115b9822e25f7ec3c857a6e1 (patch)
treecdf9e122b63908d41bde6aaad05f7c43ab7b6d73
parent33eccce577eb48d787df7ec5dd0651e87d2eb567 (diff)
downloadchromium_src-695e0d4c84455f13115b9822e25f7ec3c857a6e1.zip
chromium_src-695e0d4c84455f13115b9822e25f7ec3c857a6e1.tar.gz
chromium_src-695e0d4c84455f13115b9822e25f7ec3c857a6e1.tar.bz2
Un-flake XP Tests (1) build by disabling SSLUITest.TestWSSInvalidCertAndClose on
Windows. TBR=toyoshim@chromium.org BUG=165258 Review URL: https://codereview.chromium.org/11516011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172151 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index bffc938..f2271c7 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -553,7 +553,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) {
// Visit a HTTP page which request WSS connection to a server providing invalid
// certificate. Close the page while WSS connection waits for SSLManager's
// response from UI thread.
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) {
+// Disabled on Windows because it was flaking on XP Tests (1). crbug.com/165258
+#if defined(OS_WIN)
+#define MAYBE_TestWSSInvalidCertAndClose DISABLED_TestWSSInvalidCertAndClose
+#else
+#define MAYBE_TestWSSInvalidCertAndClose TestWSSInvalidCertAndClose
+#endif
+IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestWSSInvalidCertAndClose) {
ASSERT_TRUE(test_server()->Start());
ASSERT_TRUE(wss_server_expired_.Start());