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

Unified Diff: chrome/test/functional/ntp.py

Issue 7548024: Refactor: Make PyAuto InstallExtension() take a string. Delete dead code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixup per kkania. Created 9 years, 5 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 | « chrome/test/functional/memory.py ('k') | chrome/test/functional/themes.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/functional/ntp.py
diff --git a/chrome/test/functional/ntp.py b/chrome/test/functional/ntp.py
index 78f41a1391cee852399b468018473a4ce6d17aaf..96941c01a81c59f213b94beaebcd569c880bb35d 100644
--- a/chrome/test/functional/ntp.py
+++ b/chrome/test/functional/ntp.py
@@ -370,9 +370,8 @@ class NTPTest(pyauto.PyUITest):
Returns:
The string ID of the installed app.
"""
- app_crx_file = pyauto.FilePath(
- os.path.abspath(os.path.join(self.DataDir(), 'pyauto_private', 'apps',
- 'countdown.crx')))
+ app_crx_file = os.path.abspath(os.path.join(
+ self.DataDir(), 'pyauto_private', 'apps', 'countdown.crx'))
installed_app_id = self.InstallApp(app_crx_file)
self.assertTrue(installed_app_id, msg='App install failed.')
return installed_app_id
@@ -397,14 +396,12 @@ class NTPTest(pyauto.PyUITest):
def testGetAppsWhenInstallNonApps(self):
"""Ensures installed non-apps are not reflected in the NTP app info."""
# Install a regular extension and a theme.
- ext_crx_file = pyauto.FilePath(
- os.path.abspath(os.path.join(self.DataDir(), 'extensions',
- 'page_action.crx')))
+ ext_crx_file = os.path.abspath(os.path.join(self.DataDir(), 'extensions',
+ 'page_action.crx'))
self.assertTrue(self.InstallExtension(ext_crx_file, False),
msg='Extension install failed.')
- theme_crx_file = pyauto.FilePath(
- os.path.abspath(os.path.join(self.DataDir(), 'extensions',
- 'theme.crx')))
+ theme_crx_file = os.path.abspath(os.path.join(self.DataDir(), 'extensions',
+ 'theme.crx'))
self.assertTrue(self.SetTheme(theme_crx_file), msg='Theme install failed.')
# Verify that no apps are listed on the NTP except for the Web Store.
app_info = self.GetNTPApps()
« no previous file with comments | « chrome/test/functional/memory.py ('k') | chrome/test/functional/themes.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698