Merge autotest upstream from @5318 ~ @5336

client/virt/tests/autotest.py

Index: client/virt/tests/autotest.py
diff --git a/client/tests/kvm/tests/autotest.py b/client/virt/tests/autotest.py
similarity index 78%
rename from client/tests/kvm/tests/autotest.py
rename to client/virt/tests/autotest.py
index afc2e3b21202752278647dda2af96a02c7193159..cdea31af2a0c78118970ae5595dd7339ea359c0c 100644
--- a/client/tests/kvm/tests/autotest.py
+++ b/client/virt/tests/autotest.py
@@ -1,5 +1,5 @@
 import os
-import kvm_test_utils
+from autotest_lib.client.virt import virt_test_utils
 
 
 def run_autotest(test, params, env):
@@ -21,5 +21,5 @@ def run_autotest(test, params, env):
                                 params.get("test_control_file"))
     outputdir = test.outputdir
 
-    kvm_test_utils.run_autotest(vm, session, control_path, timeout, outputdir,
-                                params)
+    virt_test_utils.run_autotest(vm, session, control_path, timeout, outputdir,
+                                 params)