From 07d26b76ad988547641f8bd8331c3b216c9f1e0f Mon Sep 17 00:00:00 2001 From: Cong Li Date: Wed, 16 Nov 2016 17:25:02 +0800 Subject: [PATCH] qemu.tests.balloon_stress: fix session unavailable problem. 1. Using framework function get_guest_cmd_status_output() to execute cmd in guest, in case session is unavailable sometimes. 2. close session when test finished. Signed-off-by: Cong Li --- qemu/tests/balloon_stress.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qemu/tests/balloon_stress.py b/qemu/tests/balloon_stress.py index eddbd2e9..3956980a 100644 --- a/qemu/tests/balloon_stress.py +++ b/qemu/tests/balloon_stress.py @@ -38,7 +38,6 @@ def run(test, params, env): driver_name = params["driver_name"] if params["os_type"] == "windows": utils_test.qemu.setup_win_driver_verifier(driver_name, vm, timeout) - session = vm.wait_for_login(timeout=timeout) error.context("Play video in guest", logging.info) play_video_cmd = params["play_video_cmd"] @@ -46,10 +45,10 @@ def run(test, params, env): # need to wait for wmplayer loading remote video time.sleep(float(params.get("loading_timeout", 60))) check_playing_cmd = params["check_playing_cmd"] - running = utils_misc.wait_for(lambda: session.cmd_status( - check_playing_cmd) == 0, first=5.0, timeout=600) + running = utils_misc.wait_for(lambda: utils_misc.get_guest_cmd_status_output( + vm, check_playing_cmd)[0] == 0, first=5.0, timeout=600) if not running: - raise error.TestError("Video do not playing") + raise error.TestError("Video is not playing") env["balloon_test"] = 0 error.context("balloon vm memory in loop", logging.info) @@ -75,3 +74,5 @@ def run(test, params, env): error.context("verify guest still alive", logging.info) session.cmd(params["stop_player_cmd"]) vm.verify_alive() + if session: + session.close() -- GitLab