Update webdriver setup script for Download name changes.

tools/testing/webdriver_test_setup.py

 #!/usr/bin/python
 
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Run to install the necessary components to run webdriver on the buildbots or
 # on your local machine.
 # Note: The setup steps can be done fairly easily by hand. This script is
 # intended to simply and reduce the time for setup since there are a fair number
@@ skipping 106 matching lines @@
     latest = ''
     for line in f.readlines():
       if re.search(self.download_regex_str, line):
         suffix_index = line.find(
             self.download_regex_str[self.download_regex_str.rfind('.'):])
         name_end = self.download_regex_str.rfind('.+')
         name = self.download_name_func({'os': self.get_os_str, 'version': ''})
         name = name[:name.rfind('.')]
         version_str = line[line.find(name) + len(name) : suffix_index]
         orig_version_str = version_str
-        if version_str.count('.') == 0:
+        if version_str.count('.') == 0:
           version_str = version_str.replace('_', '.')
-          version_str = re.compile(r'[^\d.]+').sub('', version_str)
+          version_str = re.compile(r'[^\d.]+').sub('', version_str)
         if latest == '':
           latest = '0.' * version_str.count('.')
           latest += '0'
-          orig_latest_str = latest
-        else:
-          orig_latest_str = latest
+          orig_latest_str = latest
+        else:
+          orig_latest_str = latest
           latest = latest.replace('_', '.')
           latest = re.compile(r'[^\d.]+').sub('', latest)
         nums = version_str.split('.')
         latest_nums = latest.split('.')
         for (num, latest_num) in zip(nums, latest_nums):
           if int(num) > int(latest_num):
             latest = orig_version_str
             break
           else:
             latest = orig_latest_str
@@ skipping 38 matching lines @@
   def get_os_str(self):
     """The strings to indicate what OS a download is for as used on Google Code.
     """
     os_str = 'win'
     if 'darwin' in sys.platform:
       os_str = 'mac'
     elif 'linux' in sys.platform:
       os_str = 'linux32'
       if '64bit' in platform.architecture()[0]:
         os_str = 'linux64'
+    if self.project_name == 'chromedriver' and (
+        os_str == 'mac' or os_str == 'win'):
+      os_str = os_str + '32'
     return os_str
 
 
 class FirefoxInstaller(object):
   """Installs the latest version of Firefox on the machine."""
 
   def ff_download_site(self, os_name):
     return 'http://releases.mozilla.org/pub/mozilla.org/firefox/releases/' + \
         'latest/%s/en-US/' % os_name
 
@@ skipping 39 matching lines @@
 
 
 class SeleniumBindingsInstaller(object):
   """Install the Selenium Webdriver bindings for Python."""
 
   SETUPTOOLS_SITE = 'http://python-distribute.org/distribute_setup.py'
   PIP_SITE = 'https://raw.github.com/pypa/pip/master/contrib/get-pip.py'
   def __init__(self, is_buildbot):
     self.is_buildbot = is_buildbot
 
-  def run(self): 
+  def run(self):
     print 'Installing Selenium Python Bindings'
     admin_keyword = ''
     python_cmd = 'python'
     pip_cmd = 'pip'
     if 'win32' not in sys.platform and 'cygwin' not in sys.platform:
       admin_keyword = 'sudo'
       pip_cmd = '/usr/local/bin/pip'
     else:
       # The python installation is "special" on Windows buildbots.
       if self.is_buildbot:
@@ skipping 15 matching lines @@
 
 class OperaHtmlParser(HTMLParser.HTMLParser):
   """A helper class to parse Opera pages listing available downloads to find the
   correct download we want."""
 
   def initialize(self, rejection_func, accept_func):
     """Initialize some state for our parser.
     Arguments:
     rejection_func: A function that accepts the value of the URL and determines
       if it is of the type we are looking for.
-    accept_func: A function that takes the URL and the "current best" URL and 
+    accept_func: A function that takes the URL and the "current best" URL and
       determines if it is better than our current download url."""
     self.latest = 0
     self.rejection_func = rejection_func
     self.accept_func = accept_func
 
   def handle_starttag(self, tag, attrs):
     """Find the latest version."""
     if (tag == 'a' and attrs[0][0] == 'href' and
         self.rejection_func(attrs[0][1])):
       self.latest = self.accept_func(attrs[0][1], self.latest)
 
 class OperaInstaller(object):
   """Install from the Opera FTP website."""
 
   def find_latest_version(self, download_page, rejection_func, accept_func):
     """Get the latest non-beta version.
     Arguments:
     download_page: The initial page that lists all the download options.
     rejection_func: A function that accepts the value of the URL and determines
       if it is of the type we are looking for.
-    accept_func: A function that takes the URL and the "current best" URL and 
+    accept_func: A function that takes the URL and the "current best" URL and
       determines if it is better than our current download url."""
     f = urllib2.urlopen(download_page)
     parser = OperaHtmlParser()
     parser.initialize(rejection_func, accept_func)
     parser.feed(f.read())
     return str(parser.latest)
 
   def run(self):
     """Download and install Opera."""
     print 'Installing Opera'
     os_str = self.get_os_str
     download_name = 'http://ftp.opera.com/pub/opera/%s/' % os_str
 
     def higher_revision(new_version_str, current):
       version_string = new_version_str[:-1]
       if int(version_string) > current:
         return int(version_string)
       return current
 
     version = self.find_latest_version(
         download_name,
         lambda x: x[0] in string.digits and 'b' not in x and 'rc' not in x,
         higher_revision)
     download_name += version
-    if ('linux' in sys.platform and 
+    if ('linux' in sys.platform and
         platform.linux_distribution()[0] == 'Ubuntu'):
       # Last time I tried, the .deb file you download directly from opera was
       # not installing correctly on Ubuntu. This installs Opera more nicely.
       os.system("sudo sh -c 'wget -O - http://deb.opera.com/archive.key | "
           "apt-key add -'")
       os.system("""sudo sh -c 'echo "deb http://deb.opera.com/opera/ """
           """stable non-free" > /etc/apt/sources.list.d/opera.list'""")
       run_cmd('sudo apt-get update')
       run_cmd('sudo apt-get install opera', stdin='y')
     else:
@@ skipping 53 matching lines @@
   if not args.iedriver and platform.system() == 'Windows':
     GoogleCodeInstaller('selenium', find_depot_tools_location(args.buildbot),
         lambda x: 'IEDriverServer_Win32_%(version)s.zip' % x).run()
   if not args.firefox:
     FirefoxInstaller().run()
   if not args.opera:
     OperaInstaller().run()
 
 if __name__ == '__main__':
   main()