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

Unified Diff: chrome/test/functional/chromeos_security.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/automation/automation_proxy.cc ('k') | chrome/test/functional/extensions.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/functional/chromeos_security.py
diff --git a/chrome/test/functional/chromeos_security.py b/chrome/test/functional/chromeos_security.py
index 2788cee39892d2d8fb25f6904a84ac3d35a726c9..acbb54f2f32a74d8b7c2f2bb2420067aaa458f28 100644
--- a/chrome/test/functional/chromeos_security.py
+++ b/chrome/test/functional/chromeos_security.py
@@ -170,10 +170,9 @@ class ChromeosSecurity(pyauto.PyUITest):
self.assertTrue(
file_name in [x['crx_file'] for x in self._bundled_crx_baseline],
msg='Unexpected CRX file: ' + file_name)
- crx_file = pyauto.FilePath(
- os.path.join(self._bundled_crx_directory, file_name))
+ crx_file = os.path.join(self._bundled_crx_directory, file_name)
self.assertTrue(self.InstallExtension(crx_file, False),
- msg='Extension install failed: %s' % crx_file.value())
+ msg='Extension install failed: %s' % crx_file)
# Verify that the permissions information in the baseline matches the
# permissions associated with the installed bundled CRX extensions.
@@ -184,10 +183,9 @@ class ChromeosSecurity(pyauto.PyUITest):
# Install all bundled extensions on the device.
for file_name in os.listdir(self._bundled_crx_directory):
if file_name.endswith('.crx'):
- crx_file = pyauto.FilePath(
- os.path.join(self._bundled_crx_directory, file_name))
+ crx_file = os.path.join(self._bundled_crx_directory, file_name)
self.assertTrue(self.InstallExtension(crx_file, False),
- msg='Extension install failed: %s' % crx_file.value())
+ msg='Extension install failed: %s' % crx_file)
# Ensure that the set of installed extension names precisely matches the
# baseline.
« no previous file with comments | « chrome/test/automation/automation_proxy.cc ('k') | chrome/test/functional/extensions.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698