Skip to content
Snippets Groups Projects
Commit 48f9b3f7 authored by estade@chromium.org's avatar estade@chromium.org
Browse files

Disable plugin tests on mac.

these are consistently failing on mac 10.6; see bug.

BUG=68303
TEST=tree is a little greener

Review URL: http://codereview.chromium.org/6002019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70584 0039d316-1c4b-4281-b951-d872f2087c98
parent e6d6c910
No related branches found
No related tags found
No related merge requests found
......@@ -123,7 +123,12 @@ class PluginTest : public UITest {
}
};
// http://crbug.com/68303
#if defined(OS_MACOSX)
TEST_F(PluginTest, DISABLED_Flash) {
#else
TEST_F(PluginTest, Flash) {
#endif
// Note: This does not work with the npwrapper on 64-bit Linux. Install the
// native 64-bit Flash to run the test.
// TODO(thestig) Update this list if we decide to only test against internal
......@@ -147,7 +152,12 @@ class ClickToPlayPluginTest : public PluginTest {
}
};
// http://crbug.com/68303
#if defined(OS_MACOSX)
TEST_F(ClickToPlayPluginTest, DISABLED_Flash) {
#else
TEST_F(ClickToPlayPluginTest, Flash) {
#endif
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
......@@ -164,7 +174,12 @@ TEST_F(ClickToPlayPluginTest, Flash) {
WaitForFinish(action_max_timeout_ms(), true);
}
// http://crbug.com/68303
#if defined(OS_MACOSX)
TEST_F(ClickToPlayPluginTest, DISABLED_FlashDocument) {
#else
TEST_F(ClickToPlayPluginTest, FlashDocument) {
#endif
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());
ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment