summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 18:42:30 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-04 18:42:30 +0000
commit8589024c2d82e40ace06725b7c336cace9a9cc0f (patch)
tree0ffb45de4ad2e940c25cb99de98c09152063b359
parentc89773baa94fad32238248a9f385adb8f1f1194e (diff)
downloadchromium_src-8589024c2d82e40ace06725b7c336cace9a9cc0f.zip
chromium_src-8589024c2d82e40ace06725b7c336cace9a9cc0f.tar.gz
chromium_src-8589024c2d82e40ace06725b7c336cace9a9cc0f.tar.bz2
Temporarily disable failing ui tests on linux.
TBR=cpu Review URL: http://codereview.chromium.org/100348 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15229 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_restore_uitest.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index 4e01e8d..8b92d59 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -132,7 +132,11 @@ class TabRestoreUITest : public UITest {
// Close the end tab in the current window, then restore it. The tab should be
// in its original position, and active.
+#if defined(OS_LINUX)
+TEST_F(TabRestoreUITest, DISABLED_Basic) {
+#else
TEST_F(TabRestoreUITest, Basic) {
+#endif
scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
int starting_tab_count;
@@ -160,7 +164,11 @@ TEST_F(TabRestoreUITest, Basic) {
// Close a tab not at the end of the current window, then restore it. The tab
// should be in its original position, and active.
+#if defined(OS_LINUX)
+TEST_F(TabRestoreUITest, DISABLED_MiddleTab) {
+#else
TEST_F(TabRestoreUITest, MiddleTab) {
+#endif
scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
int starting_tab_count;
@@ -189,7 +197,11 @@ 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.
+#if defined(OS_LINUX)
+TEST_F(TabRestoreUITest, DISABLED_RestoreToDifferentWindow) {
+#else
TEST_F(TabRestoreUITest, RestoreToDifferentWindow) {
+#endif
scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
// This call is virtually guaranteed to pass, assuming that Chromium is the