diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 02:30:19 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 02:30:19 +0000 |
| commit | 48f9b3f780c11d022ccf1c8dae1fb21502470648 (patch) | |
| tree | c80b9f9febd6707dc655964c0b99f6c7743a1698 /chrome/test | |
| parent | e6d6c910d71c511824dad331c212bacaef844d75 (diff) | |
| download | chromium_src-48f9b3f780c11d022ccf1c8dae1fb21502470648.zip chromium_src-48f9b3f780c11d022ccf1c8dae1fb21502470648.tar.gz chromium_src-48f9b3f780c11d022ccf1c8dae1fb21502470648.tar.bz2 | |
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
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/plugin/plugin_test.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp index e578944..9aa885f 100644 --- a/chrome/test/plugin/plugin_test.cpp +++ b/chrome/test/plugin/plugin_test.cpp @@ -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, |