summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 20:57:45 +0000
committerrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 20:57:45 +0000
commitfac75b4cde366b6ef2e5bd3f0e3d799c34282305 (patch)
tree816b29be58938a4f982bc55dcc90fec26687562c
parentf804ac41d9d156321fa08ea16c7c1f6b4c3e68cc (diff)
downloadchromium_src-fac75b4cde366b6ef2e5bd3f0e3d799c34282305.zip
chromium_src-fac75b4cde366b6ef2e5bd3f0e3d799c34282305.tar.gz
chromium_src-fac75b4cde366b6ef2e5bd3f0e3d799c34282305.tar.bz2
Disabling flaky TabRestoreUITest.RestoreToDifferentWindow test.
BUG=http://crbug.com/10916 TBR=http://codereview.chromium.org/92086 Review URL: http://codereview.chromium.org/92086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14348 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_restore_uitest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index a712051f..6dc4466 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -180,7 +180,8 @@ 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.
-TEST_F(TabRestoreUITest, RestoreToDifferentWindow) {
+// Disabled as per: http://crbug.com/10916
+TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) {
scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
// This call is virtually guaranteed to pass, assuming that Chromium is the
@@ -276,8 +277,7 @@ TEST_F(TabRestoreUITest, BasicRestoreFromClosedWindow) {
// Open a window with multiple tabs, close a tab, then close the window.
// Restore both and make sure the tab goes back into the window.
// This test currently disabled. See http://crbug.com/10916
-TEST_F(TabRestoreUITest, RestoreWindowAndTab) {
-#if 0
+TEST_F(TabRestoreUITest, DISABLED_RestoreWindowAndTab) {
scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
CheckActiveWindow(browser_proxy.get());
@@ -326,7 +326,6 @@ TEST_F(TabRestoreUITest, RestoreWindowAndTab) {
ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
EXPECT_EQ(starting_tab_count + 3, tab_count);
EXPECT_EQ(url1_, GetActiveTabURL(1));
-#endif
}
// Open a window with two tabs, close both (closing the window), then restore