Fix server side autotests installing to the wrong directory.

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 213 matching lines @@
             '/job/tmp/file1')
         self.host.send_file.expect_call(
             "/job/tmp/file1", "autodir/control.None.autoserv.init.state")
         os.remove.expect_call("/job/tmp/file1")
 
         self.host.send_file.expect_call("temp", run_obj.remote_control_file)
         os.path.abspath.expect_call('temp').and_return('control_file')
         os.path.abspath.expect_call('control').and_return('control')
         os.remove.expect_call("temp")
 
-        run_obj.execute_control.expect_call(timeout=30,
+        run_obj.execute_control.expect_call(ignore_aborts=False,
+                                            timeout=30,
                                             client_disconnect_timeout=1800)
 
         # run and check output
         self.base_autotest.run(control, timeout=30)
         self.god.check_playback()
 
 
     def _stub_get_client_autodir_paths(self):
         def mock_get_client_autodir_paths(cls, host):
             return ['/some/path', '/another/path']
         self.god.stub_with(autotest.Autotest, 'get_client_autodir_paths',
                            classmethod(mock_get_client_autodir_paths))
 
 
+    def _stub_get_client_autodir_real_path(self):
+        def mock_get_client_autodir_real_path(cls, host):
+            return '/shiny/path'
+        self.god.stub_with(autotest.Autotest, 'get_client_autodir_real_path',
+                           classmethod(mock_get_client_autodir_real_path))
+
+
     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')
 
         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._stub_get_client_autodir_real_path()
         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('mkdir -p /shiny/path')
+        self.host.run.expect_call('mkdir -p /some/path')
+
+        result = client_utils.CmdResult()
+        result.exit_status = 0
+        self.host.run.expect_call('mount | grep -q /some/path',
+                                  ignore_status=True).and_return(result)
+        self.host.run.expect_call('umount /some/path')
+        self.host.run.expect_call('mount --bind /shiny/path /some/path')
+        self.host.run.expect_call('mount -o remount,exec /some/path')
 
         install_dir = autotest.Autotest.get_install_dir(self.host)
-        self.assertEquals(install_dir, '/another/path')
+        self.assertEquals(install_dir, '/some/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'))
         logging.exception.expect_call(mock.is_string_comparator())
         logger._process_line('AUTOTEST_TEST_COMPLETE:/autotest/fifo1')
 
@@ skipping 63 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()