From 24c81486b7f00093075da7cb1eed6a32c32c00e6 Mon Sep 17 00:00:00 2001 From: Xu Tian Date: Wed, 14 Aug 2013 10:52:57 +0800 Subject: [PATCH] qemu.test: rename parameter md5sum parameter 'md5sum' in test configuration file will conflict with cdrom iso md5sum parameter, and it will caused md5sum mismatch error when re-create(env_process.preprocess_vm) VM in test script, so rename it; Signed-off-by: Xu Tian --- qemu/tests/block_stream_stress.py | 2 +- qemu/tests/cfg/block_stream.cfg | 2 +- qemu/tests/cfg/drive_mirror.cfg | 4 ++-- qemu/tests/cfg/qemu_disk_img.cfg | 2 +- qemu/tests/drive_mirror_stress.py | 2 +- qemu/tests/qemu_disk_img.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qemu/tests/block_stream_stress.py b/qemu/tests/block_stream_stress.py index 23968efa..09417219 100644 --- a/qemu/tests/block_stream_stress.py +++ b/qemu/tests/block_stream_stress.py @@ -28,7 +28,7 @@ class BlockStreamStress(blk_stream.BlockStream): return True error.context("install stress app in guest", logging.info) link = params.get("download_link") - md5sum = params.get("md5sum") + md5sum = params.get("pkg_md5sum") tmp_dir = params.get("tmp_dir") install_cmd = params.get("install_cmd") config_cmd = params.get("config_cmd") diff --git a/qemu/tests/cfg/block_stream.cfg b/qemu/tests/cfg/block_stream.cfg index ad33ae6d..4bcc918e 100644 --- a/qemu/tests/cfg/block_stream.cfg +++ b/qemu/tests/cfg/block_stream.cfg @@ -57,7 +57,7 @@ - with_stress: type = block_stream_stress download_link = http://weather.ou.edu/~apw/projects/stress/stress-1.0.4.tar.gz - md5sum = a607afa695a511765b40993a64c6e2f4 + pkg_md5sum = a607afa695a511765b40993a64c6e2f4 install_cmd = "tar -xzvf ${tmp_dir}/stress-1.0.4.tar.gz -C ./ && cd stress-1.0.4 && ./configure --prefix=/usr && make && make install " config_cmd = "" app_check_cmd = "stress --help" diff --git a/qemu/tests/cfg/drive_mirror.cfg b/qemu/tests/cfg/drive_mirror.cfg index 7910a54a..9aca6a21 100644 --- a/qemu/tests/cfg/drive_mirror.cfg +++ b/qemu/tests/cfg/drive_mirror.cfg @@ -64,7 +64,7 @@ variants: - heavyload: download_link = http://weather.ou.edu/~apw/projects/stress/stress-1.0.4.tar.gz - md5sum = a607afa695a511765b40993a64c6e2f4 + pkg_md5sum = a607afa695a511765b40993a64c6e2f4 install_cmd = "tar -xzvf ${tmp_dir}/stress-1.0.4.tar.gz -C ./ && cd stress-1.0.4 && ./configure --prefix=/usr && make && make install " config_cmd = "" app_check_cmd = "stress --help" @@ -103,7 +103,7 @@ type = drive_mirror_powerdown app_check_cmd = "test -d ${tmp_dir}/linux-2.6.35.14" download_link = "https://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz" - md5sum = "15e4021ffcb47b93c218083e1f2734a7" + pkg_md5sum = "15e4021ffcb47b93c218083e1f2734a7" install_cmd = "tar xzvf ${tmp_dir}/linux-2.6.35.14.tar.gz -C ${tmp_dir}/" config_cmd = "cd ${tmp_dir}/linux-2.6.35.14 && make defconfig" start_cmd = "cd ${tmp_dir}/linux-2.6.35.14 && make clean && make -j `grep processor /proc/cpuinfo|wc -l` && make modules" diff --git a/qemu/tests/cfg/qemu_disk_img.cfg b/qemu/tests/cfg/qemu_disk_img.cfg index 7c2cc412..4cf82c74 100644 --- a/qemu/tests/cfg/qemu_disk_img.cfg +++ b/qemu/tests/cfg/qemu_disk_img.cfg @@ -10,7 +10,7 @@ start_vm = no image_size = 20G # md5sum binary path - md5sum = "md5sum" + md5sum_bin = "md5sum" force_create_image = no backup_image_before_testing = yes restore_image_before_testing = yes diff --git a/qemu/tests/drive_mirror_stress.py b/qemu/tests/drive_mirror_stress.py index 24dbd820..8ab8f251 100644 --- a/qemu/tests/drive_mirror_stress.py +++ b/qemu/tests/drive_mirror_stress.py @@ -17,7 +17,7 @@ class DriveMirrorStress(drive_mirror.DriveMirror): return True error.context("install stress app in guest", logging.info) link = params.get("download_link") - md5sum = params.get("md5sum") + md5sum = params.get("pkg_md5sum") tmp_dir = params.get("tmp_dir") install_cmd = params.get("install_cmd") config_cmd = params.get("config_cmd") diff --git a/qemu/tests/qemu_disk_img.py b/qemu/tests/qemu_disk_img.py index acf60d2d..60fcc66a 100644 --- a/qemu/tests/qemu_disk_img.py +++ b/qemu/tests/qemu_disk_img.py @@ -77,7 +77,7 @@ class QemuImgTest(qemu_storage.QemuImg): return False login_timeout = int(self.params.get("login_timeout", 360)) session = self.vm.wait_for_login(timeout=login_timeout) - md5bin = self.params["md5sum"] + md5bin = self.params["md5sum_bin"] cmd = "%s %s" % (md5bin, cmd) s, o = session.cmd_status_output(cmd) if s != 0: -- GitLab