Merge remote branch 'cros/upstream' into master

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 58 matching lines @@
         """
         autodir = host.get_autodir()
         if autodir:
             logging.debug('Using existing host autodir: %s', autodir)
             return autodir
 
         for path in Autotest.get_client_autodir_paths(host):
             try:
                 autotest_binary = os.path.join(path, 'bin', 'autotest')
                 host.run('test -x %s' % utils.sh_escape(autotest_binary))
+                host.run('test -w %s' % utils.sh_escape(path))
                 logging.debug('Found existing autodir at %s', path)
                 return path
             except error.AutoservRunError:
                 logging.debug('%s does not exist on %s', autotest_binary,
                               host.hostname)
         raise AutodirNotFoundError
 
 
     @classmethod
     def get_install_dir(cls, host):
@@ skipping 13 matching lines @@
             return host.get_tmp_dir(parent=install_dir)
         return install_dir
 
 
     @classmethod
     def _find_installable_dir(cls, host):
         client_autodir_paths = cls.get_client_autodir_paths(host)
         for path in client_autodir_paths:
             try:
                 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 install(self, host=None, autodir=None):
         self._install(host=host, autodir=autodir)
@@ skipping 944 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)