Fix pyauto's fetch_prebuilt_pyauto.py to account for URL changes on official build site.

chrome/test/pyautolib/fetch_prebuilt_pyauto.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Fetch prebuilt binaries to run PyAuto.
 
 Sets up Chrome and PyAuto binaries using prebuilt binaries from the
 continuous build archives.  Works on mac, win, linux (32 & 64 bit).
 
@@ skipping 36 matching lines @@
              pyauto_utils.GetCurrentPlatform())
     self._options, self._args = parser.parse_args()
     if not self._options.outdir:
       print >>sys.stderr, 'Need output directory: -d/--outdir'
       sys.exit(1)
     if not self._args:
       print >>sys.stderr, 'Need download url'
       sys.exit(2)
     self._outdir = self._options.outdir
     self._url = self._args[0]
+    if 'index.html?path=' in self._url:

[Nirnimesh, 2011/12/13 22:15:09]

Add a comment:

# Chromium continuous build archive has a non-standard format.

[dennis_jeffrey, 2011/12/14 19:33:13]

Done.

+      self._url = self._url.replace('index.html?path=', '')
+    if self._url.endswith('/'):

[Nirnimesh, 2011/12/13 22:15:09]

self._url = self._url.rstrip('/')

[dennis_jeffrey, 2011/12/14 19:33:13]

Nice.

+      self._url = self._url[:-1]
 
     # Determine name of zip.
     if not self._options.platform.startswith('linux'):
       self._chrome_zip_name = 'chrome-%s' % { 'mac': 'mac',
                                               'win': 'win32'
                                             }[self._options.platform]
     else:
       linux_32_names = ['linux', 'lucid32bit']
       linux_64_names = ['linux64', 'lucid64bit']
       linux_names = { 'linux': linux_32_names + linux_64_names,
@@ skipping 36 matching lines @@
     """Remove old binaries, if any."""
     pass
 
   def Run(self):
     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 'Fetching ' + self._chrome_zip_url
+    chrome_zip = urllib.urlretrieve(self._chrome_zip_url)[0]
+
     if get_it2me:
-      print self._it2me_zip_url
+      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 self._pyautolib_py_url
-    print self._pyautolib_so_url
-    print self._chromedriver_url
-    chrome_zip = urllib.urlretrieve(self._chrome_zip_url)[0]
-    if get_it2me:
-      it2me_zip = urllib.urlretrieve(self._it2me_zip_url)[0]
+
+    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
+      print 'Cleaning ' + chrome_unzip_dir

[Nirnimesh, 2011/12/13 22:15:09]

it's pretty standard to use , with print

[dennis_jeffrey, 2011/12/14 19:33:13]

Changed.

       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)
       shutil.move(self._outdir + '/remoting-it2me',
                   self._outdir + '/remoting/it2me.webapp')
 
     # Copy over the binaries to outdir
     items_to_copy = {
       pyautolib_py: os.path.join(self._outdir, 'pyautolib.py'),
       pyautolib_so: os.path.join(self._outdir, self._pyautolib_so_name),
@@ skipping 27 matching lines @@
       os.path.lexists(dest) and os.remove(dest)
       print 'Creating symlink "%s"' % dest
       os.symlink(framework, dest)
 
     print 'Prepared binaries in "%s"' % self._outdir
     return 0
 
 
 if __name__ == '__main__':
   sys.exit(FetchPrebuilt().Run())