From bd65ff14623d1d471a7f7b601db66274052d5a42 Mon Sep 17 00:00:00 2001 From: Cong Li Date: Thu, 8 Sep 2016 17:08:41 +0800 Subject: [PATCH] qemu.tests.block_copy: Update set_speed() to make it support more speeds. And add more speeds test scenarios for block_stream. Signed-off-by: Cong Li --- qemu/tests/block_copy.py | 9 +++++---- qemu/tests/cfg/block_stream.cfg | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/qemu/tests/block_copy.py b/qemu/tests/block_copy.py index 3aa77d4c..a4a64930 100644 --- a/qemu/tests/block_copy.py +++ b/qemu/tests/block_copy.py @@ -177,14 +177,15 @@ class BlockCopy(object): """ params = self.parser_test_args() max_speed = params.get("max_speed") - error.context("set max speed to %s B/s" % max_speed, logging.info) - self.vm.set_job_speed(self.device, max_speed) + expected_speed = int(params.get("expected_speed", max_speed)) + error.context("set speed to %s B/s" % expected_speed, logging.info) + self.vm.set_job_speed(self.device, expected_speed) status = self.get_status() if not status: raise error.TestFail("Unable to query job status.") speed = status["speed"] - if speed != max_speed: - msg = "Set speed fail. (expect speed: %s B/s," % max_speed + if speed != expected_speed: + msg = "Set speed fail. (expected speed: %s B/s," % expected_speed msg += "actual speed: %s B/s)" % speed raise error.TestFail(msg) diff --git a/qemu/tests/cfg/block_stream.cfg b/qemu/tests/cfg/block_stream.cfg index 78a93c4f..21b7c20a 100644 --- a/qemu/tests/cfg/block_stream.cfg +++ b/qemu/tests/cfg/block_stream.cfg @@ -30,6 +30,11 @@ when_streaming = "set_speed" max_speed_image1 = 10M after_finished = "reboot verify_alive" + variants: + - max_speed: + expected_speed_image1 = 10485760 + - min_speed: + expected_speed_image1 = 10 - cancel_sync: wait_finished = no cancel_timeout_image1 = 3 -- GitLab