diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 23:55:28 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 23:55:28 +0000 |
| commit | 6277278dfc9fe6a5c1068fe355f3e072a4865151 (patch) | |
| tree | 59957a164d98c6430ee3d2bad0375eab36529239 /chrome | |
| parent | d42846afcee7ad387d2c5cfb56378a76a68f7561 (diff) | |
| download | chromium_src-6277278dfc9fe6a5c1068fe355f3e072a4865151.zip chromium_src-6277278dfc9fe6a5c1068fe355f3e072a4865151.tar.gz chromium_src-6277278dfc9fe6a5c1068fe355f3e072a4865151.tar.bz2 | |
TTF: Renable TabDraggingTest.Tab1Tab{2,3}
Seems to work fine on Windows and consistently fails on Linux views.
BUG=10941
TEST=local runs
Review URL: http://codereview.chromium.org/2855012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/tabs/tab_dragging_test.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc index 4a57a53..67ba21c 100644 --- a/chrome/browser/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/views/tabs/tab_dragging_test.cc @@ -26,7 +26,7 @@ #define MAYBE_Tab2OutOfTabStrip Tab2OutOfTabStrip #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if defined(OS_LINUX) // Disabled on Toolkit views bot. See http://crbug.com/42614 #define MAYBE_Tab1Tab3Escape DISABLED_Tab1Tab3Escape #else @@ -34,6 +34,14 @@ #define MAYBE_Tab1Tab3Escape FLAKY_Tab1Tab3Escape #endif +// These tests fail on Linux. See http://crbug.com/10941 +#if defined(OS_LINUX) +#define MAYBE_Tab1Tab2 FAILS_Tab1Tab2 +#define MAYBE_Tab1Tab3 FAILS_Tab1Tab3 +#else +#define MAYBE_Tab1Tab2 Tab1Tab2 +#define MAYBE_Tab1Tab3 Tab1Tab3 +#endif class TabDraggingTest : public UITest { protected: @@ -44,8 +52,7 @@ class TabDraggingTest : public UITest { // Automated UI test to open three tabs in a new window, and drag Tab_1 into // the position of Tab_2. -// Disabled as per http://crbug.com/10941 -TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) { +TEST_F(TabDraggingTest, MAYBE_Tab1Tab2) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); scoped_refptr<WindowProxy> window(browser->GetWindow()); @@ -144,8 +151,7 @@ TEST_F(TabDraggingTest, DISABLED_Tab1Tab2) { } // Drag Tab_1 into the position of Tab_3. -// Disabled as per http://crbug.com/10941 -TEST_F(TabDraggingTest, DISABLED_Tab1Tab3) { +TEST_F(TabDraggingTest, MAYBE_Tab1Tab3) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); scoped_refptr<WindowProxy> window(browser->GetWindow()); |