Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: functional/plugins.py

Issue 7745041: Fix failing the plugin test: plugins.PluginsTest.testDisableEnableAllPlugins (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/test/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « functional/PYAUTO_TESTS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: functional/plugins.py
===================================================================
--- functional/plugins.py (revision 98389)
+++ functional/plugins.py (working copy)
@@ -47,7 +47,7 @@
if self.IsWin() or self.IsMac():
plugins = plugins + [
('silverlight_new.html', 'Silverlight'),
- ('quicktime.html', 'Quicktime'),
+ ('quicktime.html', 'QuickTime'),
('wmp_new.html', 'Windows Media'),
('real.html', 'RealPlayer'),
]
@@ -100,7 +100,7 @@
def _PluginNeedsAuthorization(self, plugin_name):
# These plug-ins seek permission to run
- return plugin_name in ['Java', 'Quicktime', 'Windows Media']
+ return plugin_name in ['Java', 'QuickTime', 'Windows Media', 'RealPlayer']
def testKillAndReloadAllPlugins(self):
"""Verify plugin processes and check if they can reload after killing."""
@@ -148,6 +148,8 @@
url = self.GetFileURLForPath(
os.path.join(self.DataDir(), 'plugin', fname))
self.NavigateToURL(url)
+ self.assertTrue(self.WaitUntil(
+ lambda: self._GetPluginPID(plugin_name) is None ))
self.assertFalse(self._GetPluginPID(plugin_name=plugin_name))
if plugin_name == 'Shockwave Flash':
continue # cannot reload file:// flash URL - crbug.com/47249
« no previous file with comments | « functional/PYAUTO_TESTS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698