client/virt/tests/guest_test.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/virt/tests/guest_test.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/virt/tests/guest_test.py

diff --git a/client/tests/kvm/tests/guest_test.py b/client/virt/tests/guest_test.py

similarity index 96%

rename from client/tests/kvm/tests/guest_test.py

rename to client/virt/tests/guest_test.py

index 95c6f7fc760bb7d3f75ae86fc3519d6055dd74c3..3bc7da778e5fef89bdcfddc9109b3ec358483858 100644

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

+++ b/client/virt/tests/guest_test.py

@@ -1,5 +1,5 @@

import os, logging

-import kvm_utils

+from autotest_lib.client.virt import virt_utils

def run_guest_test(test, params, env):

@@ -60,7 +60,7 @@ def run_guest_test(test, params, env):

logging.info("Download resource finished.")

else:

session.cmd_output("del %s" % dst_rsc_path, internal_timeout=0)

- script_path = kvm_utils.get_path(test.bindir, script)

+ script_path = virt_utils.get_path(test.bindir, script)

vm.copy_files_to(script_path, dst_rsc_path, timeout=60)

cmd = "%s %s %s" % (interpreter, dst_rsc_path, script_params)

« no previous file with comments | « client/virt/tests/guest_s4.py ('k') | client/virt/tests/image_copy.py » ('j') | no next file with comments »