Merge autotest upstream from @5318 ~ @5336

client/virt/virt_scheduler.py

Index: client/virt/virt_scheduler.py
diff --git a/client/tests/kvm/kvm_scheduler.py b/client/virt/virt_scheduler.py
similarity index 97%
rename from client/tests/kvm/kvm_scheduler.py
rename to client/virt/virt_scheduler.py
index b96bb327862f604b8a1f37b31d4ac6c1892e21e0..8353e5f9b785685be651db2e87bf3db185c202a5 100644
--- a/client/tests/kvm/kvm_scheduler.py
+++ b/client/virt/virt_scheduler.py
@@ -1,5 +1,5 @@
 import os, select
-import kvm_utils, kvm_vm, kvm_subprocess
+import virt_utils, virt_vm, aexpect
 
 
 class scheduler:
@@ -73,11 +73,11 @@ class scheduler:
             # The scheduler wants this worker to free its used resources
             elif cmd[0] == "cleanup":
                 env_filename = os.path.join(self.bindir, self_dict["env"])
-                env = kvm_utils.Env(env_filename)
+                env = virt_utils.Env(env_filename)
                 for obj in env.values():
-                    if isinstance(obj, kvm_vm.VM):
+                    if isinstance(obj, virt_vm.VM):
                         obj.destroy()
-                    elif isinstance(obj, kvm_subprocess.Spawn):
+                    elif isinstance(obj, aexpect.Spawn):
                         obj.close()
                 env.save()
                 w.write("cleanup_done\n")