Merge autotest upstream from @5318 ~ @5336

client/virt/tests/guest_test.py

 import os, logging
-import kvm_utils
+from autotest_lib.client.virt import virt_utils
 
 
 def run_guest_test(test, params, env):
     """
     A wrapper for running customized tests in guests.
 
     1) Log into a guest.
     2) Run script.
     3) Wait for script execution to complete.
     4) Pass/fail according to exit status of script.
@@ skipping 40 matching lines @@
                      (dst_rsc_dir, rsc_dir, rsc_dir)
             session.cmd(rm_cmd, timeout=test_timeout)
             logging.debug("Clean directory succeeded.")
 
             # then download the resource.
             rsc_cmd = "cd %s && %s %s" % (dst_rsc_dir, download_cmd, rsc_server)
             session.cmd(rsc_cmd, timeout=test_timeout)
             logging.info("Download resource finished.")
         else:
             session.cmd_output("del %s" % dst_rsc_path, internal_timeout=0)
-            script_path = kvm_utils.get_path(test.bindir, script)
+            script_path = virt_utils.get_path(test.bindir, script)
             vm.copy_files_to(script_path, dst_rsc_path, timeout=60)
 
         cmd = "%s %s %s" % (interpreter, dst_rsc_path, script_params)
 
         try:
             logging.info("------------ Script output ------------")
             session.cmd(cmd, print_func=logging.info, timeout=test_timeout)
         finally:
             logging.info("------------ End of script output ------------")
 
         if reboot == "yes":
             logging.debug("Rebooting guest after test ...")
             session = vm.reboot(session, timeout=login_timeout)
 
         logging.debug("guest test PASSED.")
     finally:
         session.close()