Merge remote branch 'cros/upstream' into master

server/autotest_unittest.py

Index: server/autotest_unittest.py
diff --git a/server/autotest_unittest.py b/server/autotest_unittest.py
index 6025af6b52a7a9b6388d6f71d050dce8d9bd1ab0..04023e94682cbe8b5e644afe294e621b96e6838d 100755
--- a/server/autotest_unittest.py
+++ b/server/autotest_unittest.py
@@ -256,6 +256,7 @@ class TestBaseAutotest(unittest.TestCase):
         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')
@@ -268,6 +269,7 @@ class TestBaseAutotest(unittest.TestCase):
         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')