Merge remote branch 'cros/upstream' into master.

client/bin/harness_autoserv.py

 import os, logging, ConfigParser
 from autotest_lib.client.common_lib import autotemp, base_packages, error
 from autotest_lib.client.common_lib import global_config
 from autotest_lib.client.bin import harness
 
 
 class harness_autoserv(harness.harness):
     """
     The server harness for running from autoserv
 
     Properties:
             job
                     The job object for this job
     """
 
-    def __init__(self, job):
+    def __init__(self, job, harness_args):
         """
                 job
                         The job object for this job
         """
         super(harness_autoserv, self).__init__(job)
         self.status = os.fdopen(3, 'w', 0)
 
         # If a bug on the client run code prevents global_config.ini
         # from being copied to the client machine, the client will run
         # without a global config, relying only on the defaults of the
@@ skipping 74 matching lines @@
     def fetch_pkg_file(self, filename, dest_path):
         if os.path.exists(dest_path):
             os.remove(dest_path)
         logging.info('Fetching %s from autoserv to %s', filename, dest_path)
         self.job_harness.fetch_package(filename, dest_path)
         if os.path.exists(dest_path):
             logging.debug('Successfully fetched %s from autoserv', filename)
         else:
             raise error.PackageFetchError('%s not fetched from autoserv'
                                           % filename)