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

Unified Diff: chrome/test/pyautolib/fetch_prebuilt_pyauto.py

Issue 8898029: Fix pyauto's fetch_prebuilt_pyauto.py to account for URL changes on official build site. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments. Created 9 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/fetch_prebuilt_pyauto.py
diff --git a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
index a9833121e8ce34ca19186c01fcc6c657ebf1e095..1bc62c43dc08816c96477b9b707ddca70999f161 100755
--- a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
+++ b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
@@ -54,6 +54,10 @@ class FetchPrebuilt(object):
sys.exit(2)
self._outdir = self._options.outdir
self._url = self._args[0]
+ # Chromium continuous build archive has a non-standard format.
+ if 'index.html?path=' in self._url:
+ self._url = self._url.replace('index.html?path=', '')
+ self._url = self._url.rstrip('/')
# Determine name of zip.
if not self._options.platform.startswith('linux'):
@@ -110,25 +114,29 @@ class FetchPrebuilt(object):
get_it2me = self._DoesURLExist(self._it2me_zip_url)
# Fetch chrome & pyauto binaries
- print 'Fetching'
- print self._chrome_zip_url
- if get_it2me:
- print self._it2me_zip_url
- else:
- print 'Warning: %s does not exist.' % self._it2me_zip_url
- print self._pyautolib_py_url
- print self._pyautolib_so_url
- print self._chromedriver_url
+ print 'Fetching', self._chrome_zip_url
chrome_zip = urllib.urlretrieve(self._chrome_zip_url)[0]
+
if get_it2me:
+ print 'Fetching', self._it2me_zip_url
it2me_zip = urllib.urlretrieve(self._it2me_zip_url)[0]
+ else:
+ print 'Warning: %s does not exist.' % self._it2me_zip_url
+
+ print 'Fetching', self._pyautolib_py_url
pyautolib_py = urllib.urlretrieve(self._pyautolib_py_url)[0]
+
+ print 'Fetching', self._pyautolib_so_url
pyautolib_so = urllib.urlretrieve(self._pyautolib_so_url)[0]
+
+ print 'Fetching', self._chromedriver_url
chromedriver = urllib.urlretrieve(self._chromedriver_url)[0]
+
chrome_unzip_dir = os.path.join(self._outdir, self._chrome_zip_name)
if os.path.exists(chrome_unzip_dir):
print 'Cleaning', chrome_unzip_dir
pyauto_utils.RemovePath(chrome_unzip_dir)
+ print 'Unzipping'
pyauto_utils.UnzipFilenameToDir(chrome_zip, self._outdir)
if get_it2me:
pyauto_utils.UnzipFilenameToDir(it2me_zip, self._outdir)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698