diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 16:08:59 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 16:08:59 +0000 |
| commit | 752e451f811b4b20ea7049051be44f28fe4d7581 (patch) | |
| tree | cca0114904af3c45134d73c0d7fec458e9a28007 /chrome/browser/ssl | |
| parent | a2d806f5df8b4189ef76014c69e277bed9f849b3 (diff) | |
| download | chromium_src-752e451f811b4b20ea7049051be44f28fe4d7581.zip chromium_src-752e451f811b4b20ea7049051be44f28fe4d7581.tar.gz chromium_src-752e451f811b4b20ea7049051be44f28fe4d7581.tar.bz2 | |
Moving two tests to FLAKY tests.
TestHTTPSErrorWithNoNavEntry: fails differently on 32 and 64 bits due to timing issue. (We thought it's deterinistic, but this is apparently not)
FindDisappearOnNavigate: due to asynchronous-ness on x11.
BUG=28629,28098
TEST=build and run browser_tests in 64bit.
Review URL: http://codereview.chromium.org/438010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 1266be8..e624856 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -224,7 +224,15 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) { // link with a blank target). This is to test that the lack of navigation entry // does not cause any problems (it was causing a crasher, see // http://crbug.com/19941). +#if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS) IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { +#else +// TODO(jcampan|oshima): On linux/views, the WaitForLoadStop call +// below sometimes waits forever because LOAD_STOP notification can +// happen before WaitLorLoadStop is called. Marking this test as Fleaky. +// See http://crbug/28098. +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSErrorWithNoNavEntry) { +#endif scoped_refptr<HTTPTestServer> http_server = PlainServer(); ASSERT_TRUE(http_server.get() != NULL); scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); @@ -249,9 +257,6 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->selected_index()); - // TODO(jcampan|oshima): Following code waits forever on linux/views - // because LOAD_STOP notification is issued before WaitLorLoadStop - // is called. See http://crbug/28098. #if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS) // Since the navigation was initiated by the renderer (when we clicked on the // link) and since the main page network request failed, we won't get a |