summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-24 18:55:42 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-24 18:55:42 +0000
commit4b67a25df0f0d8e6a34e13e114a42b2f91d9d0f5 (patch)
tree3e62697bbf5e358b77c9d7ba230db3a4eb9c1272 /chrome
parent954420111e33bcba51d660a18eb7adb008b90c92 (diff)
downloadchromium_src-4b67a25df0f0d8e6a34e13e114a42b2f91d9d0f5.zip
chromium_src-4b67a25df0f0d8e6a34e13e114a42b2f91d9d0f5.tar.gz
chromium_src-4b67a25df0f0d8e6a34e13e114a42b2f91d9d0f5.tar.bz2
Temporarily disabling 2 SSL UI tests because they are flacky.
BUG=2742 TBR=nsylvain Review URL: http://codereview.chromium.org/4256 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ssl_uitest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ssl_uitest.cc b/chrome/browser/ssl_uitest.cc
index 4446a02..989fdbb 100644
--- a/chrome/browser/ssl_uitest.cc
+++ b/chrome/browser/ssl_uitest.cc
@@ -202,7 +202,8 @@ TEST_F(SSLUITest, TestHTTPSExpiredCert) {
//
// Visits a page with mixed content.
-TEST_F(SSLUITest, TestMixedContents) {
+// Diasbled for flackiness (bug #2742).
+TEST_F(SSLUITest, DISABLED_TestMixedContents) {
HTTPSTestServer https_server(kHostName, kOKHTTPSPort,
kDocRoot, GetOKCertPath());
TestServer http_server(kDocRoot);
@@ -716,7 +717,8 @@ TEST_F(SSLUITest, TestConnectToBadPort) {
// - navigate to a bad HTTPS (expect unsafe content and filtered frame), then
// back
// - navigate to HTTP (expect mixed content), then back
-TEST_F(SSLUITest, TestGoodFrameNavigation) {
+// Disabled for flackiness (bug #2742).
+TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
TestServer http_server(kDocRoot);
HTTPSTestServer good_https_server(kHostName, kOKHTTPSPort,
kDocRoot, GetOKCertPath());