diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 00:02:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 00:02:03 +0000 |
| commit | cd4312179c0f13b6b330c7a9e46a6347deb27668 (patch) | |
| tree | eb5eac3d656269f77708df1298b4f2b71a7ab84d /chrome/browser/tab_restore_uitest.cc | |
| parent | 70b1f803bad74bc90a5586af96534c2b4f9a65cc (diff) | |
| download | chromium_src-cd4312179c0f13b6b330c7a9e46a6347deb27668.zip chromium_src-cd4312179c0f13b6b330c7a9e46a6347deb27668.tar.gz chromium_src-cd4312179c0f13b6b330c7a9e46a6347deb27668.tar.bz2 | |
Removes FLAKY from a couple of tests as they have not failed in the
last 300 or so times. They are crashing on chromeos though, but that
is logged as 48911.
BUG=39925 54894
TEST=none
Review URL: http://codereview.chromium.org/6372015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 9e3dac0..975a627 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -24,13 +24,17 @@ #define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow #endif -// http://crbug.com/ +// http://crbug.com/48911 #if defined(OS_CHROMEOS) && !defined(NDEBUG) #define MAYBE_RestoreWindowAndTab DISABLED_RestoreWindowAndTab #define MAYBE_RestoreWindow DISABLED_RestoreWindow +#define MAYBE_RestoreToDifferentWindow DISABLED_RestoreToDifferentWindow +#define MAYBE_RestoreIntoSameWindow DISABLED_RestoreIntoSameWindow #else #define MAYBE_RestoreWindowAndTab RestoreWindowAndTab #define MAYBE_RestoreWindow RestoreWindow +#define MAYBE_RestoreToDifferentWindow RestoreToDifferentWindow +#define MAYBE_RestoreIntoSameWindow RestoreIntoSameWindow #endif class TabRestoreUITest : public UITest { @@ -207,8 +211,7 @@ TEST_F(TabRestoreUITest, MiddleTab) { // Close a tab, switch windows, then restore the tab. The tab should be in its // original window and position, and active. -// This test is flaky. See http://crbug.com/54894 -TEST_F(TabRestoreUITest, FLAKY_RestoreToDifferentWindow) { +TEST_F(TabRestoreUITest, MAYBE_RestoreToDifferentWindow) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); @@ -396,8 +399,7 @@ TEST_F(TabRestoreUITest, MAYBE_RestoreWindowAndTab) { // Open a window with two tabs, close both (closing the window), then restore // both. Make sure both restored tabs are in the same window. -// http://crbug.com/39925 -TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) { +TEST_F(TabRestoreUITest, MAYBE_RestoreIntoSameWindow) { scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get()); CheckActiveWindow(browser_proxy.get()); |