diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 23:21:04 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-20 23:21:04 +0000 |
| commit | 0cbd22fe440faa85fe0f9166fc85d405787d1274 (patch) | |
| tree | 5371350eacd1c74261cb9171705a2c10b69c8885 | |
| parent | 01782ca98aa373fd0f0f36b98c4ef88aff6b7cb9 (diff) | |
| download | chromium_src-0cbd22fe440faa85fe0f9166fc85d405787d1274.zip chromium_src-0cbd22fe440faa85fe0f9166fc85d405787d1274.tar.gz chromium_src-0cbd22fe440faa85fe0f9166fc85d405787d1274.tar.bz2 | |
Disables a couple of consistently flakey/hanging tests.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/18384
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8334 0039d316-1c4b-4281-b951-d872f2087c98
| -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(), |