| OLD | NEW |
|---|
| 1 import os, logging | 1 import os |
| 2 from autotest_lib.client.common_lib import error | 2 import kvm_test_utils |
| 3 from autotest_lib.client.bin import utils | |
| 4 import kvm_subprocess, kvm_utils, kvm_test_utils | |
| 5 | 3 |
| 6 | 4 |
| 7 def run_autotest(test, params, env): | 5 def run_autotest(test, params, env): |
| 8 """ | 6 """ |
| 9 Run an autotest test inside a guest. | 7 Run an autotest test inside a guest. |
| 10 | 8 |
| 11 @param test: kvm test object. | 9 @param test: kvm test object. |
| 12 @param params: Dictionary with test parameters. | 10 @param params: Dictionary with test parameters. |
| 13 @param env: Dictionary with the test environment. | 11 @param env: Dictionary with the test environment. |
| 14 """ | 12 """ |
| 15 vm = kvm_test_utils.get_living_vm(env, params.get("main_vm")) | 13 vm = env.get_vm(params["main_vm"]) |
| 14 vm.verify_alive() |
| 16 timeout = int(params.get("login_timeout", 360)) | 15 timeout = int(params.get("login_timeout", 360)) |
| 17 session = kvm_test_utils.wait_for_login(vm, timeout=timeout) | 16 session = vm.wait_for_login(timeout=timeout) |
| 18 | 17 |
| 19 # Collect test parameters | 18 # Collect test parameters |
| 20 timeout = int(params.get("test_timeout", 300)) | 19 timeout = int(params.get("test_timeout", 300)) |
| 21 control_path = os.path.join(test.bindir, "autotest_control", | 20 control_path = os.path.join(test.bindir, "autotest_control", |
| 22 params.get("test_control_file")) | 21 params.get("test_control_file")) |
| 23 outputdir = test.outputdir | 22 outputdir = test.outputdir |
| 24 | 23 |
| 25 kvm_test_utils.run_autotest(vm, session, control_path, timeout, outputdir) | 24 kvm_test_utils.run_autotest(vm, session, control_path, timeout, outputdir, |
| 25 params) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6246035:
Merge remote branch 'cros/upstream' into master (Closed)
Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master