diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 22:43:22 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 22:43:22 +0000 |
| commit | 3186e828aa5b8c917f166f93ef63969284cfa892 (patch) | |
| tree | 96b2a9e9f65296d961ab44d6c3696ed7eb1bfe63 /chrome/test | |
| parent | 37c1cfb34294b31a47711b8bdb87165a91478eb6 (diff) | |
| download | chromium_src-3186e828aa5b8c917f166f93ef63969284cfa892.zip chromium_src-3186e828aa5b8c917f166f93ef63969284cfa892.tar.gz chromium_src-3186e828aa5b8c917f166f93ef63969284cfa892.tar.bz2 | |
TTF: Re-enable MouseLeaveTest.TestOnMouseOut on Mac, as the necessary
infrastructure has been ported.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2057003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/mouseleave_uitest.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/test/ui/mouseleave_uitest.cc b/chrome/test/ui/mouseleave_uitest.cc index 29e4f1c..e01a2e6 100644 --- a/chrome/test/ui/mouseleave_uitest.cc +++ b/chrome/test/ui/mouseleave_uitest.cc @@ -12,16 +12,11 @@ #include "gfx/rect.h" #include "googleurl/src/gurl.h" -#if defined(OS_MACOSX) -// window->GetViewBounds is not implemented -// window->SimulateOSMouseMove is not implemented -// http://code.google.com/p/chromium/issues/detail?id=26102 -#define MAYBE_TestOnMouseOut DISABLED_TestOnMouseOut -#elif defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_MACOSX) // Test succeeds locally, flaky on trybot // http://code.google.com/p/chromium/issues/detail?id=26349 -#define MAYBE_TestOnMouseOut FLAKY_TestOnMouseOut -#endif +#define TestOnMouseOut FLAKY_TestOnMouseOut +#endif // defined(OS_WIN) || defined(OS_MACOSX) namespace { @@ -35,7 +30,7 @@ class MouseLeaveTest : public UITest { DISALLOW_COPY_AND_ASSIGN(MouseLeaveTest); }; -TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) { +TEST_F(MouseLeaveTest, TestOnMouseOut) { GURL test_url = ui_test_utils::GetTestUrl( FilePath(FilePath::kCurrentDirectory), FilePath(FILE_PATH_LITERAL("mouseleave.html"))); |