diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ssl_uitest.cc | 6 |
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()); |