Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/control.unittests

Index: client/tests/kvm/control.unittests
diff --git a/client/tests/kvm/control.unittests b/client/tests/kvm/control.unittests
index 170c3f8925c6613f13a4e565cc99656678e26bb1..8f3fc627d5138896f05fe27ea116cf6b930fbb73 100644
--- a/client/tests/kvm/control.unittests
+++ b/client/tests/kvm/control.unittests
@@ -14,15 +14,13 @@ Runs the unittests available for a given KVM build.
 """
 
 import sys, os, logging
-# Add the KVM tests dir to the python path
-kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
-sys.path.append(kvm_test_dir)
-# Now we can import modules inside the KVM tests dir
-import kvm_utils, kvm_config
+from autotest_lib.client.common_lib import cartesian_config
+from autotest_lib.client.virt import virt_utils
 
-tests_cfg = kvm_config.config()
+parser = cartesian_config.Parser()
+kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
 tests_cfg_path = os.path.join(kvm_test_dir, "unittests.cfg")
-tests_cfg.fork_and_parse(tests_cfg_path)
+parser.parse_file(tests_cfg_path)
 
 # Run the tests
-kvm_utils.run_tests(tests_cfg.get_generator(), job)
+virt_utils.run_tests(parser, job)