client/tests/kvm/tests/steps.py - Issue 6124004: Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/tests/kvm/tests/steps.py

Issue 6124004: Revert "Merge remote branch 'cros/upstream' into autotest-rebase" (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: client/tests/kvm/tests/steps.py

diff --git a/client/tests/kvm/tests/steps.py b/client/tests/kvm/tests/steps.py

index 5d4ed25068fd7face3b44e8ced680239ce69582c..6f782f562d09f7b1581217c7e148bea732931996 100644

--- a/client/tests/kvm/tests/steps.py

+++ b/client/tests/kvm/tests/steps.py

@@ -181,7 +181,7 @@ def barrier_2(vm, words, params, debug_dir, data_scrdump_filename,

def run_steps(test, params, env):

- vm = env.get_vm(params.get("main_vm"))

+ vm = kvm_utils.env_get_vm(env, params.get("main_vm"))

if not vm:

raise error.TestError("VM object not found in environment")

if not vm.is_alive():

« no previous file with comments | « client/tests/kvm/tests/stepmaker.py ('k') | client/tests/kvm/tests/stress_boot.py » ('j') | no next file with comments »