Merge autotest upstream from @5318 ~ @5336

client/virt/tests/shutdown.py

Index: client/virt/tests/shutdown.py
diff --git a/client/tests/kvm/tests/shutdown.py b/client/virt/tests/shutdown.py
similarity index 93%
rename from client/tests/kvm/tests/shutdown.py
rename to client/virt/tests/shutdown.py
index fc0407fdb03e90f909f7753049e886f040957595..ac41a4a0c65b5cc0ba062b1de38ed34551bd49f4 100644
--- a/client/tests/kvm/tests/shutdown.py
+++ b/client/virt/tests/shutdown.py
@@ -1,6 +1,6 @@
 import logging, time
 from autotest_lib.client.common_lib import error
-import kvm_subprocess, kvm_test_utils, kvm_utils
+from autotest_lib.client.virt import virt_utils
 
 
 def run_shutdown(test, params, env):
@@ -34,7 +34,7 @@ def run_shutdown(test, params, env):
             logging.info("system_powerdown monitor command sent; waiting for "
                          "guest to go down...")
 
-        if not kvm_utils.wait_for(vm.is_dead, 240, 0, 1):
+        if not virt_utils.wait_for(vm.is_dead, 240, 0, 1):
             raise error.TestFail("Guest refuses to go down")
 
         logging.info("Guest is down")