Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/tests/kvm/tests/unittest.py

Index: client/tests/kvm/tests/unittest.py
diff --git a/client/tests/kvm/tests/unittest.py b/client/tests/kvm/tests/unittest.py
index c724051bf8134c7f32b91458130d65054ddf9343..54e5f73aa7a88e22245d693eaeec12578acd9188 100644
--- a/client/tests/kvm/tests/unittest.py
+++ b/client/tests/kvm/tests/unittest.py
@@ -36,8 +36,8 @@ def run_unittest(test, params, env):
                               unittest_cfg)
     logging.debug('Unit test list: %s' % test_list)
 
-    if params.get('test_list'):
-        test_list = params.get('test_list').split()
+    if params.get('test_list', None):
+        test_list = kvm_utils.get_sub_dict_names(params, 'test_list')
         logging.info('Original test list overriden by user')
         logging.info('User defined unit test list: %s' % test_list)
 
@@ -88,7 +88,7 @@ def run_unittest(test, params, env):
             try:
                 vm_name = params.get('main_vm')
                 kvm_preprocessing.preprocess_vm(test, params, env, vm_name)
-                vm = env.get_vm(vm_name)
+                vm = kvm_utils.env_get_vm(env, vm_name)
                 vm.create()
                 vm.monitor.cmd("cont")
                 logging.info("Waiting for unittest %s to complete, timeout %s, "