Make run_remote_test's use of ssh-agent more predictable.

src/scripts/run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to run client or server tests on a live remote image.
  
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 11 matching lines @@
 DEFINE_string machine_desc "" "Machine description used in database"
 DEFINE_string build_desc "" "Build description used in database"
 DEFINE_string chroot_dir "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
 
 function cleanup() {
   if [[ $FLAGS_cleanup -eq ${FLAGS_TRUE} ]]; then
     rm -rf "${TMP}"
   else
     echo "Left temporary files at ${TMP}"
   fi
-  if [[ -n "${SSH_AGENT_PID}" ]]
-  then
-    kill ${SSH_AGENT_PID} 2>/dev/null
-    unset SSH_AGENT_PID SSH_AUTH_SOCK
-  fi
+  cleanup_remote_access
 }
 
 # Returns an error if the test_result_file has text which indicates
 # the test was not run successfully.
 # Arguments:
 #   $1 - file name of autotest status for to check for success
 # Returns:
 #   None
 function is_successful_test() {
   local file="$1"
@@ skipping 160 matching lines @@
         echo "Parse failed." | tee -a "${FLAGS_output_file}"
         FLAGS_cleanup=${FLAGS_FALSE}
       fi
     fi
   done
 
   echo "Output stored to ${FLAGS_output_file}"
 }
 
 main $@