diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 20:30:45 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-09 20:30:45 +0000 |
| commit | 6e361384bf6ed0307eb353ce0c039049eb1efb07 (patch) | |
| tree | bd9fbd172639fff332786e53c52d31a7a494d2f6 /chrome/browser/ssl | |
| parent | 980abb1a0ee220077635a9eb47c370b2b41f4fb1 (diff) | |
| download | chromium_src-6e361384bf6ed0307eb353ce0c039049eb1efb07.zip chromium_src-6e361384bf6ed0307eb353ce0c039049eb1efb07.tar.gz chromium_src-6e361384bf6ed0307eb353ce0c039049eb1efb07.tar.bz2 | |
More flakyness
BUG=40932
TEST=none
TBR=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/1591028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 2a3f3d6..fb3d447 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -173,7 +173,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { // Visits a page with https error and don't proceed (and ensure we can still // navigate at that point): -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) { +// Marked as flaky, see bug 40932. +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndDontProceed) { scoped_refptr<HTTPTestServer> http_server = PlainServer(); ASSERT_TRUE(http_server.get() != NULL); scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); @@ -278,7 +279,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { } // Visits a page with https error and then goes forward using GoToOffset. -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) { +// Marked as flaky, see bug 40932. +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) { scoped_refptr<HTTPTestServer> http_server = PlainServer(); ASSERT_TRUE(http_server.get() != NULL); scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); @@ -933,7 +935,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) { CheckAuthenticatedState(tab, false, false); } -IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorker) { +// Marked as flaky, see bug 40932. +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorker) { scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); ASSERT_TRUE(good_https_server.get() != NULL); scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |