Remove pyautolib dependency

install_test/install_test.py

 # Copyright (c) 2012 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.
 
 """Test fixture for tests involving installing/updating Chrome.
 
 Provides an interface to install or update chrome from within a testcase, and
 allows users to run tests using installed version of Chrome. User and system
 level installations are supported, and either one can be used for running the
 tests. Currently the only platform it supports is Windows.
 """
 
-import atexit
 import os
-import platform
-import stat
 import sys
-import tempfile
 import unittest
 import urllib
 
 import chrome_installer_win
 
 _DIRECTORY = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.join(os.path.dirname(_DIRECTORY), 'pyautolib'))
 sys.path.append(os.path.join(_DIRECTORY, os.path.pardir, os.path.pardir,
                              os.path.pardir, 'third_party', 'webdriver',
                              'pylib'))
+sys.path.append(os.path.join(_DIRECTORY, os.path.pardir, 'pylib'))
 
 # This import should go after sys.path is set appropriately.
 from chrome import Chrome
 from selenium import webdriver
 import selenium.webdriver.chrome.service as service
 from selenium.webdriver.chrome.service import WebDriverException
 
-import pyauto_utils
-
-
-def MakeTempDir(parent_dir=None):
-  """Creates a temporary directory and returns an absolute path to it.
-
-  The temporary directory is automatically deleted when the python interpreter
-  exits normally.
-
-  Args:
-    parent_dir: the directory to create the temp dir in. If None, the system
-                temp dir is used.
-
-  Returns:
-    The absolute path to the temporary directory.
-  """
-  path = tempfile.mkdtemp(dir=parent_dir)
-  def DeleteDir():
-    # Don't use shutil.rmtree because it can't delete read-only files on Win.
-    for root, dirs, files in os.walk(path, topdown=False):
-      for name in files:
-        filename = os.path.join(root, name)
-        os.chmod(filename, stat.S_IWRITE)
-        os.remove(filename)
-      for name in dirs:
-        os.rmdir(os.path.join(root, name))
-    # Delete parent directory after its contents have been removed.
-    os.rmdir(path)
-  atexit.register(DeleteDir)
-  return path
+from common import util
 
 
 class InstallTest(unittest.TestCase):
   """Base updater test class.
 
   All dependencies, like Chrome installers and ChromeDriver, are downloaded at
   the beginning of the test. Dependencies are downloaded in the temp directory.
   This download occurs only once, before the first test is executed. Each test
   case starts an instance of ChromeDriver and terminates it upon completion.
   All updater tests should derive from this class.
@@ skipping 71 matching lines @@
     if self._driver:
       try:
         self._driver.quit()
       except WebDriverException:
         pass
     options = []
     options.extend(self._installer_options)
     if self._install_type == chrome_installer_win.InstallationType.SYSTEM:
       options.append('--system-level')
     if master_pref:
-      options.append('--installerdata="%s"' % master_pref)

[Paweł Hajdan Jr., 2012/12/13 19:28:02]

What's the problem with quotes here?

[nkang1, 2012/12/13 19:45:59]

The installer doesn't load the master preferences file if quotes are added.
That's why we decided to remove them.

+      options.append('--installerdata=%s' % master_pref)
     self._installation = chrome_installer_win.Install(
         self._installer_paths[build],
         self._install_type,
         build,
         options)
 
   def GetInstallBuild(self):
     """Returns Chorme build to be used for install test scenarios."""
     return self._install_build
 
   def GetUpdateBuilds(self):
     """Returns Chrome builds to be used for update test scenarios."""
     return self._update_builds
 
   @staticmethod
   def _Download(url, path):
     """Downloads a file from the specified URL.
 
     Args:
       url: URL where the file is located.
       path: Location where file will be downloaded.
     """
-    if not pyauto_utils.DoesUrlExist(url):
+    if not util.DoesUrlExist(url):
       raise RuntimeError('Either the URL or the file name is invalid.')
     urllib.urlretrieve(url, path)
 
   @staticmethod
   def SetInstallType(install_type):
     """Sets Chrome installation type.
 
     Args:
       install_type: Type of installation(i.e., user or system).
     """
@@ skipping 11 matching lines @@
     Args:
       install_build: A string representing the Chrome build to be used for
                      install testing. Pass this argument only if testing
                      fresh install scenarios.
       update_builds: A list that contains the Chrome builds to be used for
                      testing update scenarios. Pass this argument only if
                      testing upgrade scenarios.
       base_url: Base url of the 'official chrome builds' page.
       options: A list that contains options to be passed to Chrome installer.
     """
-    system = ({'Windows': 'win',
-               'Darwin': 'mac',
-               'Linux': 'linux'}).get(platform.system())
+    system = util.GetPlatformName()
     InstallTest._install_build = install_build
     InstallTest._update_builds = update_builds
     InstallTest._installer_options = options
-    tempdir = MakeTempDir()
+    tempdir = util.MakeTempDir()
     builds = []
     if InstallTest._install_build:
       builds.append(InstallTest._install_build)
     if InstallTest._update_builds:
       builds.extend(InstallTest._update_builds)
     # Remove any duplicate build numbers.
     builds = list(frozenset(builds))
     for build in builds:
       url = '%s%s/%s/mini_installer.exe' % (base_url, build, system)
       installer_path = os.path.join(tempdir, 'mini_installer_%s.exe' % build)
       InstallTest._installer_paths[build] = installer_path
       InstallTest._Download(url, installer_path)
     InstallTest._chrome_driver = os.path.join(tempdir, 'chromedriver.exe')
     url = '%s%s/%s/%s/chromedriver.exe' % (base_url, build, system,
                                            'chrome-win32.test')
     InstallTest._Download(url, InstallTest._chrome_driver)