client/tests/kvm/tests/build.py - Issue 6883246: Merge autotest upstream from @5318 ~ @5336

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/build.py

Issue 6883246: Merge autotest upstream from @5318 ~ @5336 (Closed) Base URL: ssh://gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 8 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:

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

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

index cbf4aedbf98aaf4148126cbea05e3a83bd484db1..cfebcd6f78ced5a91627ec10228be719eccbdd13 100644

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

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

@@ -1,4 +1,4 @@

-import installer

+from autotest_lib.client.virt import kvm_installer

def run_build(test, params, env):

@@ -14,7 +14,7 @@ def run_build(test, params, env):

params["srcdir"] = srcdir

try:

- installer_object = installer.make_installer(params)

+ installer_object = kvm_installer.make_installer(params)

installer_object.set_install_params(test, params)

installer_object.install()

env.register_installer(installer_object)

@@ -22,5 +22,5 @@ def run_build(test, params, env):

# if the build/install fails, don't allow other tests

# to get a installer.

msg = "KVM install failed: %s" % (e)

- env.register_installer(installer.FailedInstaller(msg))

+ env.register_installer(kvm_installer.FailedInstaller(msg))

raise

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