diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-28 00:47:10 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-28 00:47:10 +0000 |
| commit | 4ed506f8fa199eaae299639d19b416488d313201 (patch) | |
| tree | bcbfa51245b6d805f8faed08df6215a571f22ae0 /chrome/test | |
| parent | 56749b26c7bea3e376bdc4c9e30b58302d746f65 (diff) | |
| download | chromium_src-4ed506f8fa199eaae299639d19b416488d313201.zip chromium_src-4ed506f8fa199eaae299639d19b416488d313201.tar.gz chromium_src-4ed506f8fa199eaae299639d19b416488d313201.tar.bz2 | |
Fix the UI label for verifying flash plugin status and re-enable this test.
BUG=125062
Review URL: https://chromiumcodereview.appspot.com/10237009
Patch from Vivian <vivianz@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 2 | ||||
| -rwxr-xr-x | chrome/test/functional/about_plugins_ui.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index c60e739..aec1bf9 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -567,8 +567,6 @@ '-extensions.ExtensionsTest.testAllowIncognitoExtension', # crbug.com/115646 '-translate.TranslateTest.testSeveralLanguages', - # crbug.com/125062 - '-about_plugins_ui.ChromeAboutPluginsUITest.testEnableAndDisableFlashPlugin', ], 'mac': [ diff --git a/chrome/test/functional/about_plugins_ui.py b/chrome/test/functional/about_plugins_ui.py index fe76531..3c2e3c2 100755 --- a/chrome/test/functional/about_plugins_ui.py +++ b/chrome/test/functional/about_plugins_ui.py @@ -130,7 +130,7 @@ class ChromeAboutPluginsUITest(pyauto.PyUITest): # Verify internal flash is disabled. pyauto_utils.WaitForDomElement(self, internal_flash_elem, - './/ancestor::*[@class="plugin-file-disabled"]') + './/ancestor::*[@class="plugin-disabled"]') self.assertTrue(self.WaitUntil(lambda: not self._IsEnabled('Shockwave Flash'))) @@ -140,7 +140,7 @@ class ChromeAboutPluginsUITest(pyauto.PyUITest): internal_flash_enable_link.click() self.assertTrue(self.WaitUntil(lambda: len( internal_flash_elem.find_elements_by_xpath( - './/ancestor::*[@class="plugin-file-enabled"]')) == 1), + './/ancestor::*[@class="plugin-enabled"]')) > 0), msg='Failed to enable internal Flash plugin') self.assertTrue(self.WaitUntil(lambda: self._IsEnabled('Shockwave Flash'))) |