Merge autotest upstream from @5318 ~ @5336

client/virt/virt_scheduler.py

 import os, select
-import kvm_utils, kvm_vm, kvm_subprocess
+import virt_utils, virt_vm, aexpect
 
 
 class scheduler:
     """
     A scheduler that manages several parallel test execution pipelines on a
     single host.
     """
 
     def __init__(self, tests, num_workers, total_cpus, total_mem, bindir):
         """
@@ skipping 53 matching lines @@
                 test_iterations = int(test.get("iterations", 1))
                 status = run_test_func("kvm", params=test,
                                        tag=test.get("shortname"),
                                        iterations=test_iterations)
                 w.write("done %s %s\n" % (test_index, status))
                 w.write("ready\n")
 
             # 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")
                 w.write("ready\n")
 
             # There's no more work for this worker
             elif cmd[0] == "terminate":
                 break
 
 
@@ skipping 129 matching lines @@
                     self.s2w_w[worker].write("cleanup\n")
                     idle_workers.remove(worker)
                     closing_workers.append(worker)
 
             # If there are no more new tests to run, terminate the workers and
             # the scheduler
             if len(idle_workers) == self.num_workers:
                 for worker in idle_workers:
                     self.s2w_w[worker].write("terminate\n")
                 break