From f4d8e907855b9f03c0d07e771e035833804cd7f0 Mon Sep 17 00:00:00 2001 From: Yiqiao Pu Date: Mon, 3 Jun 2013 23:53:09 +0800 Subject: [PATCH] tests: Update clean up session to serial session As this guest performance will get worse when the disk is filled up, and may influence the normal session. Use serial session instead. Signed-off-by: Yiqiao Pu --- tests/fillup_disk.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/fillup_disk.py b/tests/fillup_disk.py index 5db6445e..2f674b5a 100644 --- a/tests/fillup_disk.py +++ b/tests/fillup_disk.py @@ -9,14 +9,15 @@ def run_fillup_disk(test, params, env): Suggest to test rebooting vm after this test. - @param test: kvm test object + @param test: QEMU test object @param params: Dictionary with the test parameters @param env: Dictionary with test environment. """ vm = env.get_vm(params["main_vm"]) vm.verify_alive() - timeout = int(params.get("login_timeout", 360)) - session = vm.wait_for_login(timeout=timeout) + login_timeout = int(params.get("login_timeout", 360)) + session = vm.wait_for_login(timeout=login_timeout) + session2 = vm.wait_for_serial_login(timeout=login_timeout) fillup_timeout = int(params.get("fillup_timeout")) fillup_size = int(params.get("fillup_size")) @@ -43,7 +44,7 @@ def run_fillup_disk(test, params, env): while number >= 0: cmd = "rm -f /%s/fillup.%d" % (fill_dir, number) logging.debug(cmd) - s, o = session.cmd_status_output(cmd) + s, o = session2.cmd_status_output(cmd) if s != 0: logging.error(o) raise error.TestFail("Failed to remove file %s: %s;" @@ -51,3 +52,4 @@ def run_fillup_disk(test, params, env): "command timeout" % (number, o)) number -= 1 session.close() + session2.close() -- GitLab