diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 21:20:06 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-04 21:20:06 +0000 |
| commit | 41e1b2625248b71a758e7c1603f9ac71f62e7ef1 (patch) | |
| tree | 2e748b575343cd4ae75f05b39861f18e5ce8e1fb | |
| parent | 84bfc25b652a5b3e00f6fcd18d1864770fd96b60 (diff) | |
| download | chromium_src-41e1b2625248b71a758e7c1603f9ac71f62e7ef1.zip chromium_src-41e1b2625248b71a758e7c1603f9ac71f62e7ef1.tar.gz chromium_src-41e1b2625248b71a758e7c1603f9ac71f62e7ef1.tar.bz2 | |
Disable KeyboardAccessTest.ReserveKeyboardAccelerators on ChromeOS
BUG=none
TEST=greener tree
Review URL: http://codereview.chromium.org/3612003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61416 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/interactive_ui/keyboard_access_uitest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc index 54054be..849571e 100644 --- a/chrome/test/interactive_ui/keyboard_access_uitest.cc +++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc @@ -117,9 +117,17 @@ TEST_F(KeyboardAccessTest, TestShiftAltMenuKeyboardAccess) { TestMenuKeyboardAccess(true, views::Event::EF_SHIFT_DOWN); } +// TODO(isherman): This test times out on ChromeOS. We should merge it with +// BrowserKeyEventsTest.ReservedAccelerators, but just disable for now. +#if defined(OS_CHROMEOS) +#define MAYBE_ReserveKeyboardAccelerators DISABLED_ReserveKeyboardAccelerators +#else +#define MAYBE_ReserveKeyboardAccelerators ReserveKeyboardAccelerators +#endif + // Test that JavaScript cannot intercept reserved keyboard accelerators like // ctrl-t to open a new tab or ctrl-f4 to close a tab. -TEST_F(KeyboardAccessTest, ReserveKeyboardAccelerators) { +TEST_F(KeyboardAccessTest, MAYBE_ReserveKeyboardAccelerators) { const std::string kBadPage = "<html><script>" "document.onkeydown = function() {" |