From 2ca6651c30490057e8f8f401332314c3e729f514 Mon Sep 17 00:00:00 2001 From: Lucas Meneghel Rodrigues Date: Wed, 22 May 2013 21:32:01 -0300 Subject: [PATCH] drive_mirror tests: small cleanups Signed-off-by: Lucas Meneghel Rodrigues --- qemu/tests/drive_mirror_powerdown.py | 4 ++-- qemu/tests/drive_mirror_stress.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/tests/drive_mirror_powerdown.py b/qemu/tests/drive_mirror_powerdown.py index c42c7e06..473bb84b 100644 --- a/qemu/tests/drive_mirror_powerdown.py +++ b/qemu/tests/drive_mirror_powerdown.py @@ -37,7 +37,7 @@ class DriveMirrorPowerdown(drive_mirror_stress.DriveMirrorStress): params = self.parser_test_args() image_file = params.get("image_file") target_image = params.get("target_image") - cmd = "yes|mv %s %s" % (target_image, image_file) + cmd = "mv -f %s %s" % (target_image, image_file) error.context("copy target image") utils.system(cmd) error.context("powerup vm with target image", logging.info) @@ -47,7 +47,7 @@ class DriveMirrorPowerdown(drive_mirror_stress.DriveMirrorStress): params = self.parser_test_args() image_file = params.get("image_file") super(DriveMirrorPowerdown, self).clean() - cmd = "yes|mv %s-bak %s" % (image_file, image_file) + cmd = "mv -f %s-bak %s" % (image_file, image_file) utils.system(cmd) def run_drive_mirror_powerdown(test, params, env): diff --git a/qemu/tests/drive_mirror_stress.py b/qemu/tests/drive_mirror_stress.py index e850a390..3177efde 100644 --- a/qemu/tests/drive_mirror_stress.py +++ b/qemu/tests/drive_mirror_stress.py @@ -35,13 +35,13 @@ class DriveMirrorStress(drive_mirror.DriveMirror): @error.context_aware def load_stress(self): """ - load IO/CPU/Memoery stress in guest; + load IO/CPU/Memory stress in guest; """ params = self.parser_test_args() self.install_stress_app() cmd = params.get("start_cmd") session = self.get_session() - error.context("lanuch stress app in guest", logging.info) + error.context("launch stress app in guest", logging.info) session.sendline(cmd) logging.info("Command: %s" % cmd) runing = utils_misc.wait_for(self.app_runing, first=0.5, timeout=300) -- GitLab