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

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

similarity index 93%

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

rename to client/virt/tests/image_copy.py

index 8a4d74c869a48be56e2f88d323b3e11e8d346b0a..cc921ab6bb641b79c7c71658556939367f0c27f7 100644

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

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

@@ -1,7 +1,7 @@

import os, logging

from autotest_lib.client.common_lib import error

from autotest_lib.client.bin import utils

-import kvm_utils

+from autotest_lib.client.virt import virt_utils

def run_image_copy(test, params, env):

@@ -33,7 +33,7 @@ def run_image_copy(test, params, env):

dst_path = '%s.%s' % (params['image_name'], params['image_format'])

cmd = 'cp %s %s' % (src_path, dst_path)

- if not kvm_utils.mount(src, mount_dest_dir, 'nfs', 'ro'):

+ if not virt_utils.mount(src, mount_dest_dir, 'nfs', 'ro'):

raise error.TestError('Could not mount NFS share %s to %s' %

(src, mount_dest_dir))

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