client/tests/kvm/tests/migration_with_reboot.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/migration_with_reboot.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/migration_with_reboot.py

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

index a15f983965c8a4bbcafa95a1eb93a8aaab53c8d1..5dddb1274a04ed835925e037c9040e6dd0eecdd1 100644

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

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

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

-import kvm_utils

+from autotest_lib.client.virt import virt_utils

def run_migration_with_reboot(test, params, env):

@@ -27,7 +27,7 @@ def run_migration_with_reboot(test, params, env):

try:

# Reboot the VM in the background

- bg = kvm_utils.Thread(vm.reboot, (session,))

+ bg = virt_utils.Thread(vm.reboot, (session,))

bg.start()

try:

while bg.isAlive():