Merge remote branch 'autotest-upstream/master' into autotest-merge

server/autotest.py

 # Copyright 2007 Google Inc. Released under the GPL v2
 
 import re, os, sys, traceback, subprocess, time, pickle, glob, tempfile
 import logging, getpass
 from autotest_lib.server import installable_object, prebuild, utils
 from autotest_lib.client.common_lib import base_job, log, error, autotemp
 from autotest_lib.client.common_lib import global_config, packages
 from autotest_lib.client.common_lib import utils as client_utils
 
 AUTOTEST_SVN  = 'svn://test.kernel.org/autotest/trunk/client'
@@ skipping 101 matching lines @@
                 host.run('mkdir -p %s' % utils.sh_escape(path))
                 host.run('test -w %s' % utils.sh_escape(path))
                 return path
             except error.AutoservRunError:
                 logging.debug('Failed to create %s', path)
         raise error.AutoservInstallError(
                 'Unable to find a place to install Autotest; tried %s',
                 ', '.join(client_autodir_paths))
 
 
+    def get_fetch_location(self):
+        c = global_config.global_config
+        repos = c.get_config_value("PACKAGES", 'fetch_location', type=list,
+                                   default=[])
+        repos.reverse()
+        return repos
+
+
     def install(self, host=None, autodir=None):
         self._install(host=host, autodir=autodir)
 
 
     def install_full_client(self, host=None, autodir=None):
         self._install(host=host, autodir=autodir, use_autoserv=False,
                       use_packaging=False)
 
 
     def install_no_autoserv(self, host=None, autodir=None):
         self._install(host=host, autodir=autodir, use_autoserv=False)
 
 
     def _install_using_packaging(self, host, autodir):
-        c = global_config.global_config
-        repos = c.get_config_value("PACKAGES", 'fetch_location', type=list,
-                                   default=[])
-        repos.reverse()
+        repos = self.get_fetch_location()
         if not repos:
             raise error.PackageInstallError("No repos to install an "
                                             "autotest client from")
         pkgmgr = packages.PackageManager(autodir, hostname=host.hostname,
                                          repo_urls=repos,
                                          do_locking=False,
                                          run_function=host.run,
                                          run_function_dargs=dict(timeout=600))
         # The packages dir is used to store all the packages that
         # are fetched on that client. (for the tests,deps etc.
@@ skipping 204 matching lines @@
 
         # build up the initialization prologue for the control file
         prologue_lines = []
 
         # Add the additional user arguments
         prologue_lines.append("args = %r\n" % self.job.args)
 
         # If the packaging system is being used, add the repository list.
         repos = None
         try:
-            c = global_config.global_config
-            repos = c.get_config_value("PACKAGES", 'fetch_location', type=list)
-            repos.reverse()  # high priority packages should be added last
+            repos = self.get_fetch_location()
             pkgmgr = packages.PackageManager('autotest', hostname=host.hostname,
                                              repo_urls=repos)
             prologue_lines.append('job.add_repository(%s)\n' % repos)
         except global_config.ConfigError, e:
             # If repos is defined packaging is enabled so log the error
             if repos:
                 logging.error(e)
 
         # on full-size installs, turn on any profilers the server is using
         if not atrun.background:
@@ skipping 617 matching lines @@
                     self.host.send_file(tarball_path, remote_dest)
                 finally:
                     temp_dir.clean()
                 return
 
 
     def log_warning(self, msg, warning_type):
         """Injects a WARN message into the current status logging stream."""
         timestamp = int(time.time())
         if self.job.warning_manager.is_valid(timestamp, warning_type):
-            self.job.record('WARN', None, None, {}, msg)
+            self.job.record('WARN', None, None, msg)
 
 
     def write(self, data):
         # now start processing the existing buffer and the new data
         data = self.leftover + data
         lines = data.split('\n')
         processed_lines = 0
         try:
             # process all the buffered data except the last line
             # ignore the last line since we may not have all of it yet
@@ skipping 53 matching lines @@
 
         @returns: True if the test passes, False otherwise."""
         at = self._Autotest()
         control_file = ('result = job.run_test(%s)\n'
                         'job.set_state("test_result", result)\n')
         test_args = [repr(test_name)]
         test_args += ['%s=%r' % (k, v) for k, v in dargs.iteritems()]
         control_file %= ', '.join(test_args)
         at.run(control_file, host=self)
         return at.job.get_state('test_result', default=False)