summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib
diff options
context:
space:
mode:
authordtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 18:45:18 +0000
committerdtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 18:45:18 +0000
commita58d9281450575bec955ff95af44c3456fa48f06 (patch)
tree0fe65f0f12b82668bfa488c7341a3ee9dab67a28 /chrome/test/pyautolib
parentb34362b1875222ef6441c939de9214c9e0a3b204 (diff)
downloadchromium_src-a58d9281450575bec955ff95af44c3456fa48f06.zip
chromium_src-a58d9281450575bec955ff95af44c3456fa48f06.tar.gz
chromium_src-a58d9281450575bec955ff95af44c3456fa48f06.tar.bz2
Fix fetch_prebuilt_pyauto.py.
It is not working because IT2Me is not currently archived on Windows official builds. BUG=None. TEST=Run it. Review URL: http://codereview.chromium.org/7888068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
-rw-r--r--chrome/test/pyautolib/fetch_prebuilt_pyauto.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
index 721dda3..9b4c367 100644
--- a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
+++ b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py
@@ -108,16 +108,21 @@ class FetchPrebuilt(object):
self._ParseArgs()
if not os.path.isdir(self._outdir):
os.makedirs(self._outdir)
+ get_it2me = self._DoesURLExist(self._it2me_zip_url)
# Fetch chrome & pyauto binaries
print 'Fetching'
print self._chrome_zip_url
- print self._it2me_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
chrome_zip = urllib.urlretrieve(self._chrome_zip_url)[0]
- it2me_zip = urllib.urlretrieve(self._it2me_zip_url)[0]
+ if get_it2me:
+ it2me_zip = urllib.urlretrieve(self._it2me_zip_url)[0]
pyautolib_py = urllib.urlretrieve(self._pyautolib_py_url)[0]
pyautolib_so = urllib.urlretrieve(self._pyautolib_so_url)[0]
chromedriver = urllib.urlretrieve(self._chromedriver_url)[0]
@@ -126,9 +131,10 @@ class FetchPrebuilt(object):
print 'Cleaning', chrome_unzip_dir
pyauto_utils.RemovePath(chrome_unzip_dir)
pyauto_utils.UnzipFilenameToDir(chrome_zip, self._outdir)
- pyauto_utils.UnzipFilenameToDir(it2me_zip, self._outdir)
- shutil.move(self._outdir + '/remoting-it2me',
- self._outdir + '/remoting/it2me.webapp')
+ if get_it2me:
+ pyauto_utils.UnzipFilenameToDir(it2me_zip, self._outdir)
+ shutil.move(self._outdir + '/remoting-it2me',
+ self._outdir + '/remoting/it2me.webapp')
# Copy over the binaries to outdir
items_to_copy = {