diff options
| author | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 22:48:07 +0000 |
|---|---|---|
| committer | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 22:48:07 +0000 |
| commit | 2c3173ac7dafcccb4a1336fd6fbe4822325477a5 (patch) | |
| tree | 1540251209260fc0a81bcbf0fce8f26f9fe88419 /chrome/test/pyautolib | |
| parent | 41b328e6609f1b089b588f62527f2444eba8303f (diff) | |
| download | chromium_src-2c3173ac7dafcccb4a1336fd6fbe4822325477a5.zip chromium_src-2c3173ac7dafcccb4a1336fd6fbe4822325477a5.tar.gz chromium_src-2c3173ac7dafcccb4a1336fd6fbe4822325477a5.tar.bz2 | |
Fix fetch_prebuilt_pyauto.py and update it to include IT2Me.
BUG=None.
TEST=Run the script.
Review URL: http://codereview.chromium.org/7787009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
| -rw-r--r-- | chrome/test/pyautolib/fetch_prebuilt_pyauto.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py index 684013e..721dda3 100644 --- a/chrome/test/pyautolib/fetch_prebuilt_pyauto.py +++ b/chrome/test/pyautolib/fetch_prebuilt_pyauto.py @@ -78,6 +78,7 @@ class FetchPrebuilt(object): # Setup urls to download. self._chrome_zip_url = '%s/%s.zip' % (self._url, self._chrome_zip_name) + self._it2me_zip_url = self._url + '/' + 'remoting-it2me.zip' chrome_test_url = '%s/%s.test' % (self._url, self._chrome_zip_name) self._pyautolib_py_url = '%s/pyautolib.py' % chrome_test_url if self._options.platform == 'win': @@ -94,7 +95,10 @@ class FetchPrebuilt(object): parsed = urlparse.urlparse(url) conn = httplib.HTTPConnection(parsed.netloc) conn.request('HEAD', parsed.path) - return conn.getresponse().status == 200 + response = conn.getresponse() + if response.status == 302: # Redirect; follow it. + return self._DoesURLExist(response.getheader('location')) + return response.status == 200 def Cleanup(self): """Remove old binaries, if any.""" @@ -108,10 +112,12 @@ class FetchPrebuilt(object): # Fetch chrome & pyauto binaries print 'Fetching' print self._chrome_zip_url + print 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] 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] @@ -120,6 +126,9 @@ 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') # Copy over the binaries to outdir items_to_copy = { |