diff options
| author | lzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-25 21:46:01 +0000 |
|---|---|---|
| committer | lzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-25 21:46:01 +0000 |
| commit | 67abf765d0a83aeec11e6026295c5e359066cbc1 (patch) | |
| tree | 32bedbb781020bcdd103e69357e18c348103a7d0 | |
| parent | 47d53eaa9d114bc433f41c563706d6fc2ea62234 (diff) | |
| download | chromium_src-67abf765d0a83aeec11e6026295c5e359066cbc1.zip chromium_src-67abf765d0a83aeec11e6026295c5e359066cbc1.tar.gz chromium_src-67abf765d0a83aeec11e6026295c5e359066cbc1.tar.bz2 | |
Mark BrowserActionApiTest.BrowserActionPopup flaky.
TEST=none
BUG=70829
Review URL: http://codereview.chromium.org/6250028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72552 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 915e7af..ea0b6dd 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -143,7 +143,14 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) { EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0)); } -IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionPopup) { +// http://code.google.com/p/chromium/issues/detail?id=70829 +// Only mac is okay. +#if !defined(OS_MACOSX) +#define MAYBE_BrowserActionPopup FLAKY_BrowserActionPopup +#else +#define MAYBE_BrowserActionPopup BrowserActionPopup +#endif +IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MAYBE_BrowserActionPopup) { ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII( "browser_action/popup"))); BrowserActionTestUtil actions_bar = GetBrowserActionsBar(); |