Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1354)

Unified Diff: client/tests/kvm/tests/stress_boot.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
« no previous file with comments | « client/tests/kvm/tests/steps.py ('k') | client/tests/kvm/tests/timedrift.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/kvm/tests/stress_boot.py
diff --git a/client/tests/kvm/tests/stress_boot.py b/client/tests/kvm/tests/stress_boot.py
index 37d853b216378aeed76edb3506d7aa9a7f496c81..b7916b490499beca3ab75368ea40742c36502d6c 100644
--- a/client/tests/kvm/tests/stress_boot.py
+++ b/client/tests/kvm/tests/stress_boot.py
@@ -36,7 +36,7 @@ def run_stress_boot(tests, params, env):
vm_name = "vm" + str(num)
vm_params = vm.get_params().copy()
curr_vm = vm.clone(vm_name, vm_params)
- env.register_vm(vm_name, curr_vm)
+ kvm_utils.env_register_vm(env, vm_name, curr_vm)
logging.info("Booting guest #%d" % num)
kvm_preprocessing.preprocess_vm(tests, vm_params, env, vm_name)
params['vms'] += " " + vm_name
@@ -51,9 +51,7 @@ def run_stress_boot(tests, params, env):
# check whether all previous shell sessions are responsive
for i, se in enumerate(sessions):
- try:
- se.cmd(params.get("alive_test_cmd"))
- except kvm_subprocess.ShellError:
+ if se.get_command_status(params.get("alive_test_cmd")) != 0:
raise error.TestFail("Session #%d is not responsive" % i)
num += 1
« no previous file with comments | « client/tests/kvm/tests/steps.py ('k') | client/tests/kvm/tests/timedrift.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698