diff options
| author | rohitbm@google.com <rohitbm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 18:38:31 +0000 |
|---|---|---|
| committer | rohitbm@google.com <rohitbm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 18:38:31 +0000 |
| commit | 048ebcb544ac5658ca864a71ca620a888c7a8688 (patch) | |
| tree | 322d1b132020dd8899ec9c657bd72e4abb281958 | |
| parent | 5309c66c950932560e4e122e0f8c36150412fe7f (diff) | |
| download | chromium_src-048ebcb544ac5658ca864a71ca620a888c7a8688.zip chromium_src-048ebcb544ac5658ca864a71ca620a888c7a8688.tar.gz chromium_src-048ebcb544ac5658ca864a71ca620a888c7a8688.tar.bz2 | |
Corrected plugin_check test for Windows Chrome
Review URL: http://codereview.chromium.org/6462018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74307 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/functional/plugins_check.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/test/functional/plugins_check.py b/chrome/test/functional/plugins_check.py index 82d42fe..3081787 100644 --- a/chrome/test/functional/plugins_check.py +++ b/chrome/test/functional/plugins_check.py @@ -29,10 +29,19 @@ class PluginsCheck(pyauto.PyUITest): def testPluginsStates(self): """Verify plugins' versions and states.""" + if self.IsLinux(): + # TODO(rohitbm) + # Add plugins_check support for Linux + logging.debug('Not performing plugins check on linux') + return browser_plugins_list = self.GetPluginsInfo().Plugins() + version_sep = '.' + if self.IsWin(): + # Windows flash plugin version uses |,| instead of |.| + version_sep = ',' for plugin in self._ReadPluginsList(): test_plugin = [x['name'] for x in browser_plugins_list \ - if x['version'] == plugin['version'] and \ + if x['version'] == plugin['version'].replace('.', version_sep) and \ str(x['enabled']) == plugin['enabled'] and \ x['name'] == plugin['name']] plugin_info = '[ NAME : %s, VERSION: %s, ENABLED: %s]' % \ |