diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 07:01:15 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 07:01:15 +0000 |
| commit | e5e7689b1b56b4038439d16eab7ca5fa4941c9e3 (patch) | |
| tree | c67a3d1169ffd35efdaa2d146af7cc0032cb61ac | |
| parent | 20a793eb518ccc6503f6521e0ebc806e8e686a06 (diff) | |
| download | chromium_src-e5e7689b1b56b4038439d16eab7ca5fa4941c9e3.zip chromium_src-e5e7689b1b56b4038439d16eab7ca5fa4941c9e3.tar.gz chromium_src-e5e7689b1b56b4038439d16eab7ca5fa4941c9e3.tar.bz2 | |
Temporarily disables tests that does not work with DOMUI menu2.
TBR=isherman@chromium.org
BUG=chromium-os:7642
TEST=chromeos bots cycles green.
Review URL: http://codereview.chromium.org/3676006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62262 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 9 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/keyboard_access_uitest.cc | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 5dab3bf..945d9c0 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -562,9 +562,16 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { } #endif // !defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) +// crosbug.com/7642. +#define MAYBE_CloseWithAppMenuOpen DISABLED_CloseWithAppMenuOpen +#else +#define MAYBE_CloseWithAppMenuOpen CloseWithAppMenuOpen +#eidnf + // This test verifies we don't crash when closing the last window and the app // menu is showing. -IN_PROC_BROWSER_TEST_F(BrowserTest, CloseWithAppMenuOpen) { +IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_CloseWithAppMenuOpen) { if (browser_defaults::kBrowserAliveWithNoWindows) return; diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc index 849571e..c865cf5 100644 --- a/chrome/test/interactive_ui/keyboard_access_uitest.cc +++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc @@ -105,11 +105,20 @@ void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence, ASSERT_EQ(1, tab_index); } -TEST_F(KeyboardAccessTest, TestMenuKeyboardAccess) { +#if defined(OS_CHROMEOS) +// crosbug.com/7642. +#define MAYBE_TestMenuKeyboardAccess DISABLED_TestMenuKeyboardAccess +#define MAYBE_TestAltMenuKeyboardAccess DISABLED_TestAltMenuKeyboardAccess +#else +#define MAYBE_TestMenuKeyboardAccess TestMenuKeyboardAccess +#define MAYBE_TestAltMenuKeyboardAccess TestAltMenuKeyboardAccess +#eidnf + +TEST_F(KeyboardAccessTest, MAYBE_TestMenuKeyboardAccess) { TestMenuKeyboardAccess(false, 0); } -TEST_F(KeyboardAccessTest, TestAltMenuKeyboardAccess) { +TEST_F(KeyboardAccessTest, MAYBE_TestAltMenuKeyboardAccess) { TestMenuKeyboardAccess(true, 0); } |