Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

server/hosts/abstract_ssh.py

 import os, time, types, socket, shutil, glob, logging, traceback
 from autotest_lib.client.common_lib import autotemp, error, logging_manager
 from autotest_lib.server import utils, autotest
 from autotest_lib.server.hosts import remote
 from autotest_lib.client.common_lib.global_config import global_config
 
 
 get_value = global_config.get_config_value
 enable_master_ssh = get_value('AUTOSERV', 'enable_master_ssh', type=bool,
                               default=False)
@@ skipping 97 matching lines @@
             delete_flag = ""
         if preserve_symlinks:
             symlink_flag = ""
         else:
             symlink_flag = "-L"
         command = "rsync %s %s --timeout=1800 --rsh='%s' -az %s %s"
         return command % (symlink_flag, delete_flag, ssh_cmd,
                           " ".join(sources), dest)
 
 
-    def _make_ssh_cmd(self, cmd):
-        """
-        Create a base ssh command string for the host which can be used
-        to run commands directly on the machine
-        """
-        base_cmd = make_ssh_command(user=self.user, port=self.port,
-                                    opts=self.master_ssh_option,
-                                    hosts_file=self.known_hosts_fd)
-
-        return '%s %s "%s"' % (base_cmd, self.hostname, utils.sh_escape(cmd))
-
     def _make_scp_cmd(self, sources, dest):
         """
         Given a list of source paths and a destination path, produces the
         appropriate scp command for encoding it. Remote paths must be
         pre-encoded.
         """
         command = ("scp -rq %s -o StrictHostKeyChecking=no "
                    "-o UserKnownHostsFile=%s -P %d %s '%s'")
         return command % (self.master_ssh_option, self.known_hosts_fd,
                           self.port, " ".join(sources), dest)
@@ skipping 455 matching lines @@
 
         This is useful if the test SSHes to the machine, then reinstalls it,
         then SSHes to it again.  It can be called after the reinstall to
         reduce the spam in the logs.
         """
         logging.info("Clearing known hosts for host '%s', file '%s'.",
                      self.hostname, self.known_hosts_fd)
         # Clear out the file by opening it for writing and then closing.
         fh = open(self.known_hosts_fd, "w")
         fh.close()