diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 13:16:09 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 13:16:09 +0000 |
| commit | d367b995ae4470ff1f3cb724a08e30856867f2fb (patch) | |
| tree | a2093b8a191064f10fded8b457cd2c749cec836c /chrome/browser/tab_restore_uitest.cc | |
| parent | 52739eef518c2df91eb6b81d2c255ae7d0712c2c (diff) | |
| download | chromium_src-d367b995ae4470ff1f3cb724a08e30856867f2fb.zip chromium_src-d367b995ae4470ff1f3cb724a08e30856867f2fb.tar.gz chromium_src-d367b995ae4470ff1f3cb724a08e30856867f2fb.tar.bz2 | |
Marking some bugs as flaky that are failing on chromium xp a lot now.
TBR=vandebo
BUG=55380
TEST=greener tree
Review URL: http://codereview.chromium.org/3290026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 4e48d5a..bfb1ad2a 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -454,7 +454,13 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) { // Tests that a duplicate history entry is not created when we restore a page // to an existing SiteInstance. (Bug 1230446) -TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { +#if defined(OS_WIN) +// http://crbug.com/55380 - NavigateToURL to making this flaky +#define MAYBE_RestoreWithExistingSiteInstance FLAKY_RestoreWithExistingSiteInstance +#else +#define MAYBE_RestoreWithExistingSiteInstance RestoreWithExistingSiteInstance +#endif +TEST_F(TabRestoreUITest, MAYBE_RestoreWithExistingSiteInstance) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); @@ -501,7 +507,13 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { // Tests that the SiteInstances used for entries in a restored tab's history // are given appropriate max page IDs, even if the renderer for the entry // already exists. (Bug 1204135) -TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) { +#if defined(OS_WIN) +// http://crbug.com/55380 - NavigateToURL to making this flaky +#define MAYBE_RestoreCrossSiteWithExistingSiteInstance FLAKY_RestoreCrossSiteWithExistingSiteInstance +#else +#define MAYBE_RestoreCrossSiteWithExistingSiteInstance RestoreCrossSiteWithExistingSiteInstance +#endif +TEST_F(TabRestoreUITest, MAYBE_RestoreCrossSiteWithExistingSiteInstance) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); |