diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-04 01:48:28 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-04 01:48:28 +0000 |
| commit | 27e74481eb9809b6093abc5efec3bbb3afd68f4e (patch) | |
| tree | d80f3af7d04450de3f5e7a8e4c14803e86fb78c4 /ash | |
| parent | 43b9517ae28e7c0e3b3b2567e2336c81f38dd392 (diff) | |
| download | chromium_src-27e74481eb9809b6093abc5efec3bbb3afd68f4e.zip chromium_src-27e74481eb9809b6093abc5efec3bbb3afd68f4e.tar.gz chromium_src-27e74481eb9809b6093abc5efec3bbb3afd68f4e.tar.bz2 | |
Disable failing system modal test on Mac/Aura shell unit tests
Disables SystemModalContainerLayoutManagerTest.CanActivateAfterEndModalSession
on Mac aura_shell_unittests. Will reenable once modality is implemented.
BUG=None
TEST=SystemModalContainerLayoutManagerTest.CanActivateAfterEndModalSession
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9325043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/system_modal_container_layout_manager_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index e3be65d..eb4d608 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -166,10 +166,17 @@ TEST_F(SystemModalContainerLayoutManagerTest, ModalTransient) { EXPECT_TRUE(do2.destroyed()); } +// Fails on Mac only. Needs to be implemented. http://crbug.com/111279. +#if defined(OS_MACOSX) +#define MAYBE_CanActivateAfterEndModalSession \ + DISABLED_CanActivateAfterEndModalSession +#else +#define MAYBE_CanActivateAfterEndModalSession CanActivateAfterEndModalSession +#endif // Tests that we can activate an unrelated window after a modal window is closed // for a window. TEST_F(SystemModalContainerLayoutManagerTest, - CanActivateAfterEndModalSession) { + MAYBE_CanActivateAfterEndModalSession) { scoped_ptr<aura::Window> unrelated(TestWindow::OpenTestWindow(NULL, false)); unrelated->SetBounds(gfx::Rect(100, 100, 50, 50)); scoped_ptr<aura::Window> parent(TestWindow::OpenTestWindow(NULL, false)); |