Merge autotest upstream from @5318 ~ @5336

client/virt/tests/pxe.py

Index: client/virt/tests/pxe.py
diff --git a/client/tests/kvm/tests/pxe.py b/client/virt/tests/pxe.py
similarity index 88%
rename from client/tests/kvm/tests/pxe.py
rename to client/virt/tests/pxe.py
index 7c294c1c46b8f9d779b199479453b99e664b8fe1..325e353b4976c24d9cc05cd49a540af1420479e1 100644
--- a/client/tests/kvm/tests/pxe.py
+++ b/client/virt/tests/pxe.py
@@ -1,7 +1,6 @@
 import logging
 from autotest_lib.client.common_lib import error
-import kvm_subprocess
-
+from autotest_lib.client.virt import aexpect
 
 def run_pxe(test, params, env):
     """
@@ -20,7 +19,7 @@ def run_pxe(test, params, env):
     timeout = int(params.get("pxe_timeout", 60))
 
     logging.info("Try to boot from PXE")
-    output = kvm_subprocess.run_fg("tcpdump -nli %s" % vm.get_ifname(),
+    output = aexpect.run_fg("tcpdump -nli %s" % vm.get_ifname(),
                                    logging.debug, "(pxe capture) ", timeout)[1]
 
     logging.info("Analyzing the tcpdump result...")