diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 13:27:30 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 13:27:30 +0000 |
| commit | 1d4bae6d48e6f2ebbff4037eb874cde8d4b8be00 (patch) | |
| tree | 2ac861deefd296fcf9d244fb2b2875c20f8465bb /chrome/test/functional/themes.py | |
| parent | 3d7c67e27742720e11016762cef5dbcbda8e2f05 (diff) | |
| download | chromium_src-1d4bae6d48e6f2ebbff4037eb874cde8d4b8be00.zip chromium_src-1d4bae6d48e6f2ebbff4037eb874cde8d4b8be00.tar.gz chromium_src-1d4bae6d48e6f2ebbff4037eb874cde8d4b8be00.tar.bz2 | |
Allow chromedriver to install an extension and get all installed extension IDs.
Fix install extension hook to only watch for internal extension install.
BUG=103033,93571
TEST=none
Review URL: http://codereview.chromium.org/8649004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/functional/themes.py')
| -rwxr-xr-x | chrome/test/functional/themes.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/functional/themes.py b/chrome/test/functional/themes.py index bd94874..2c81200 100755 --- a/chrome/test/functional/themes.py +++ b/chrome/test/functional/themes.py @@ -28,7 +28,7 @@ class ThemesTest(pyauto.PyUITest): self.assertFalse(self.GetThemeInfo()) # Verify there's no theme at startup crx_file = os.path.abspath( os.path.join(self.DataDir(), 'extensions', 'theme.crx')) - self.assertTrue(self.SetTheme(crx_file)) + self.SetTheme(crx_file) # Verify "theme installed" infobar shows up self.assertTrue(self.WaitForInfobarCount(1)) theme = self.GetThemeInfo() @@ -41,7 +41,7 @@ class ThemesTest(pyauto.PyUITest): self.assertFalse(self.GetThemeInfo()) # Verify there's no theme at startup crx_file = os.path.abspath( os.path.join(self.DataDir(), 'extensions', 'theme.crx')) - self.assertTrue(self.SetTheme(crx_file)) + self.SetTheme(crx_file) # Verify "theme installed" infobar shows up self.assertTrue(self.WaitForInfobarCount(1)) theme = self.GetThemeInfo() @@ -51,7 +51,7 @@ class ThemesTest(pyauto.PyUITest): """Verify theme reset.""" crx_file = os.path.abspath( os.path.join(self.DataDir(), 'extensions', 'theme.crx')) - self.assertTrue(self.SetTheme(crx_file)) + self.SetTheme(crx_file) self.assertTrue(self.ResetToDefaultTheme()) self.assertFalse(self.GetThemeInfo()) @@ -78,8 +78,7 @@ class ThemesTest(pyauto.PyUITest): # Apply each theme in this group. for theme in this_group: logging.debug('Applying theme: %s' % theme) - self.assertTrue(self.SetTheme(theme), - 'Theme %s not installed.' % theme) + self.SetTheme(theme) for url in urls: self.NavigateToURL(url) |