diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 07:29:27 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 07:29:27 +0000 |
| commit | 97e539fdea1592b638834cedcec95f72de4c1de5 (patch) | |
| tree | 278598cbe810ecfa0bfdfb6df61f385016b307b2 /chrome | |
| parent | c981bd88c2849d8747b4f613d950d1fd5f4e7bbf (diff) | |
| download | chromium_src-97e539fdea1592b638834cedcec95f72de4c1de5.zip chromium_src-97e539fdea1592b638834cedcec95f72de4c1de5.tar.gz chromium_src-97e539fdea1592b638834cedcec95f72de4c1de5.tar.bz2 | |
Mark SessionHistoryTest.FrameFormBackForward as flaky.
TBR=jhawkins
BUG=70883
TEST=ui_tests
Review URL: http://codereview.chromium.org/6384013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/session_history_uitest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 1553b1d..36d302b 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -144,15 +144,9 @@ TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) { EXPECT_EQ(L"bot3", GetTabTitle()); } -#if defined(OS_WIN) -// See http://crbug.com/61619 -#define MAYBE_FrameBackForward FLAKY_FrameBackForward -#else -#define MAYBE_FrameBackForward FrameBackForward -#endif - // Test that back/forward works when navigating in subframes. -TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) { +// Flaky, http://crbug.com/61619 and http://crbug.com/70883. +TEST_F(SessionHistoryTest, FLAKY_FrameBackForward) { ASSERT_TRUE(test_server_.Start()); // about:blank should be loaded first. |