diff options
| -rw-r--r-- | chrome/browser/browser_uitest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_uitest.cc | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 97aa9d2..1037a89 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -123,7 +123,8 @@ TEST_F(BrowserTest, DISABLED_WindowsSessionEnd) { ASSERT_TRUE(exited_cleanly); } -TEST_F(BrowserTest, JavascriptAlertActivatesTab) { +// This test is flakey, see bug 5668 for details. +TEST_F(BrowserTest, DISABLED_JavascriptAlertActivatesTab) { scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0)); int start_index; ASSERT_TRUE(window->GetActiveTabIndex(&start_index)); diff --git a/chrome/browser/ssl/ssl_uitest.cc b/chrome/browser/ssl/ssl_uitest.cc index 2a84744..7faefae 100644 --- a/chrome/browser/ssl/ssl_uitest.cc +++ b/chrome/browser/ssl/ssl_uitest.cc @@ -105,7 +105,8 @@ TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) { } // Visits a page over OK https: -TEST_F(SSLUITest, TestOKHTTPS) { +// Disabled as test causes hangs, see bug 6698 for details. +TEST_F(SSLUITest, DISABLED_TestOKHTTPS) { scoped_refptr<HTTPSTestServer> https_server = GoodCertServer(); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), @@ -126,7 +127,8 @@ TEST_F(SSLUITest, TestOKHTTPS) { } // Visits a page with https error and proceed: -TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { +// Disabled as test causes hangs, see bug 6698 for details. +TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndProceed) { scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); scoped_ptr<TabProxy> tab(GetActiveTabProxy()); NavigateTab(tab.get(), |