From 67abf765d0a83aeec11e6026295c5e359066cbc1 Mon Sep 17 00:00:00 2001 From: "lzheng@chromium.org" Date: Tue, 25 Jan 2011 21:46:01 +0000 Subject: 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 --- chrome/browser/extensions/browser_action_apitest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'chrome') 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(); -- cgit v1.1