diff options
author | venkataramana@chromium.org <venkataramana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 01:08:14 +0000 |
---|---|---|
committer | venkataramana@chromium.org <venkataramana@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-08 01:08:14 +0000 |
commit | da8a028ef8b7049494e97838bf49936a4b1220a5 (patch) | |
tree | b512d8f69cd4a547c89af10fa2a3a3c3804c89cc | |
parent | 5070e4909e74addafa97afb1d3834603498a5ed3 (diff) | |
download | chromium_src-da8a028ef8b7049494e97838bf49936a4b1220a5.zip chromium_src-da8a028ef8b7049494e97838bf49936a4b1220a5.tar.gz chromium_src-da8a028ef8b7049494e97838bf49936a4b1220a5.tar.bz2 |
Fix the plugin test: plugins.PluginsTest.testDisableEnableAllPlugins
BUG=87811
TEST= run plugins.PluginsTest.testDisableEnableAllPlugins
Review URL: http://codereview.chromium.org/8198018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104620 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 2 | ||||
-rw-r--r-- | chrome/test/functional/plugins.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index 5256037..e34142c 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -116,8 +116,6 @@ '-cookies.CookiesTest.testBlockCookiesUsingExceptions', # crbug.com/86524 '-plugins.PluginsTest.testAllowPluginException', - # crbug.com/87811 - '-plugins.PluginsTest.testDisableEnableAllPlugins', # crbug.com/85307 '-plugins.PluginsTest.testKillAndReloadAllPlugins', # crbug.com/88574 diff --git a/chrome/test/functional/plugins.py b/chrome/test/functional/plugins.py index 8229cd4..725d577 100644 --- a/chrome/test/functional/plugins.py +++ b/chrome/test/functional/plugins.py @@ -134,6 +134,12 @@ class PluginsTest(pyauto.PyUITest): This is equivalent to testing the enable/disable functionality in chrome://plugins """ + # Flash files loaded too quickly after firing browser end up getting + # downloaded, which seems to indicate that the plugin hasn't been + # registered yet. + # Hack to register Flash plugin on all platforms. crbug.com/94123 + self.GetPluginsInfo() + for fname, plugin_name in self._ObtainPluginsList(): # Verify initial state self.assertTrue(self._IsEnabled(plugin_name), |