From 3d024b21342c0c7187cd7b5c1e9f039e96a07bcd Mon Sep 17 00:00:00 2001 From: Xu Tian Date: Sun, 2 Jun 2013 11:16:07 +0800 Subject: [PATCH] virt.tests: update iozone_windows test use utils_misc.get_winutils_vol() to instead static volume ID, becase winutils cdrom has different volume ID when use different driver_format on different windows guest; Signed-off-by: Xu Tian --- tests/cfg/iozone_windows.cfg | 11 +++++++++-- tests/iozone_windows.py | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/cfg/iozone_windows.cfg b/tests/cfg/iozone_windows.cfg index 9ef56cdb..dbd324c8 100644 --- a/tests/cfg/iozone_windows.cfg +++ b/tests/cfg/iozone_windows.cfg @@ -2,5 +2,12 @@ virt_test_type = qemu libvirt only Windows type = iozone_windows - iozone_cmd = "D:\IOzone\iozone.exe -a" - iozone_timeout = 3600 + cdrom_cd1 = isos/windows/winutils.iso + iozone_cmd = "%s:\iozone\iozone -azR -r 64k -n 1G -g 4G -M -b iozone.xls -f c:\testfile" + iozone_timeout = 7200 + mem = 2048 + variants: + aio_native: + image_aio = native + aio_threads: + image_aio = threads diff --git a/tests/iozone_windows.py b/tests/iozone_windows.py index 0b333d0d..b474b5a8 100644 --- a/tests/iozone_windows.py +++ b/tests/iozone_windows.py @@ -1,6 +1,7 @@ import logging, os from autotest.client import utils from virttest import postprocess_iozone +from virttest import utils_misc def run_iozone_windows(test, params, env): @@ -24,7 +25,8 @@ def run_iozone_windows(test, params, env): analysisdir = os.path.join(test.resultsdir, 'analysis_%s' % test.iteration) # Run IOzone and record its results - c = params.get("iozone_cmd") + drive_letter = utils_misc.get_winutils_vol(session) + c = params["iozone_cmd"] % drive_letter t = int(params.get("iozone_timeout")) logging.info("Running IOzone command on guest, timeout %ss", t) results = session.cmd_output(cmd=c, timeout=t) -- GitLab