Merge remote branch 'cros/upstream' into master

server/autotest_unittest.py

 #!/usr/bin/python
 
 __author__ = "raphtee@google.com (Travis Miller)"
 
 import unittest, os, tempfile, logging
 
 import common
 from autotest_lib.server import autotest, utils, hosts, server_job, profilers
 from autotest_lib.client.bin import sysinfo
 from autotest_lib.client.common_lib import utils as client_utils, packages
@@ skipping 238 matching lines @@
     def _expect_failed_run(self, command):
         (self.host.run.expect_call(command)
          .and_raises(error.AutoservRunError('dummy', object())))
 
 
     def test_get_installed_autodir(self):
         self._stub_get_client_autodir_paths()
         self.host.get_autodir.expect_call().and_return(None)
         self._expect_failed_run('test -x /some/path/bin/autotest')
         self.host.run.expect_call('test -x /another/path/bin/autotest')
+        self.host.run.expect_call('test -w /another/path')
 
         autodir = autotest.Autotest.get_installed_autodir(self.host)
         self.assertEquals(autodir, '/another/path')
 
 
     def test_get_install_dir(self):
         self._stub_get_client_autodir_paths()
         self.host.get_autodir.expect_call().and_return(None)
         self._expect_failed_run('test -x /some/path/bin/autotest')
         self._expect_failed_run('test -x /another/path/bin/autotest')
         self._expect_failed_run('mkdir -p /some/path')
         self.host.run.expect_call('mkdir -p /another/path')
+        self.host.run.expect_call('test -w /another/path')
 
         install_dir = autotest.Autotest.get_install_dir(self.host)
         self.assertEquals(install_dir, '/another/path')
 
 
     def test_client_logger_process_line_log_copy_collection_failure(self):
         collector = autotest.log_collector.expect_new(self.host, '', '')
         logger = autotest.client_logger(self.host, '', '')
         collector.collect_client_job_results.expect_call().and_raises(
                 Exception('log copy failure'))
@@ skipping 66 matching lines @@
 
 
     def test_fails_with_exception(self):
         self.assertEqual(False, self.mixin.run_test('sleeptest'))
         self.assert_("job.run_test('sleeptest')\n" in self.control_file)
         self.assertEqual(self.mixin, self.host)
 
 
 if __name__ == "__main__":
     unittest.main()