From nobody Fri Oct 24 09:53:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519430403553534.7785817869419; Fri, 23 Feb 2018 16:00:03 -0800 (PST) Received: from localhost ([::1]:47910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epNFy-0004Ih-PI for importer@patchew.org; Fri, 23 Feb 2018 19:00:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epN8K-0005pY-QI for qemu-devel@nongnu.org; Fri, 23 Feb 2018 18:52:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epN8H-0005qJ-Qs for qemu-devel@nongnu.org; Fri, 23 Feb 2018 18:52:08 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44364 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epN8A-0005Vg-K8; Fri, 23 Feb 2018 18:51:58 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D95C2EB6ED; Fri, 23 Feb 2018 23:51:52 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id A915F1049479; Fri, 23 Feb 2018 23:51:52 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 18:51:27 -0500 Message-Id: <20180223235142.21501-7-jsnow@redhat.com> In-Reply-To: <20180223235142.21501-1-jsnow@redhat.com> References: <20180223235142.21501-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Feb 2018 23:51:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 23 Feb 2018 23:51:52 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC v4 06/21] iotests: add pause_wait X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, John Snow , pkrempa@redhat.com, jtc@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Split out the pause command into the actual pause and the wait. Not every usage presently needs to resubmit a pause request. The intent with the next commit will be to explicitly disallow redundant or meaningless pause/resume requests, so the tests need to become more judicious to reflect that. Signed-off-by: John Snow Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf --- tests/qemu-iotests/030 | 6 ++---- tests/qemu-iotests/055 | 17 ++++++----------- tests/qemu-iotests/iotests.py | 12 ++++++++---- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 457984b8e9..251883226c 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -86,11 +86,9 @@ class TestSingleDrive(iotests.QMPTestCase): result =3D self.vm.qmp('block-stream', device=3D'drive0') self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('block-job-pause', device=3D'drive0') - self.assert_qmp(result, 'return', {}) - + self.pause_job('drive0', wait=3DFalse) self.vm.resume_drive('drive0') - self.pause_job('drive0') + self.pause_wait('drive0') =20 result =3D self.vm.qmp('query-block-jobs') offset =3D self.dictpath(result, 'return[0]/offset') diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index 8a5d9fd269..3437c11507 100755 --- a/tests/qemu-iotests/055 +++ b/tests/qemu-iotests/055 @@ -86,11 +86,9 @@ class TestSingleDrive(iotests.QMPTestCase): target=3Dtarget, sync=3D'full') self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('block-job-pause', device=3D'drive0') - self.assert_qmp(result, 'return', {}) - + self.pause_job('drive0', wait=3DFalse) self.vm.resume_drive('drive0') - self.pause_job('drive0') + self.pause_wait('drive0') =20 result =3D self.vm.qmp('query-block-jobs') offset =3D self.dictpath(result, 'return[0]/offset') @@ -303,13 +301,12 @@ class TestSingleTransaction(iotests.QMPTestCase): ]) self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('block-job-pause', device=3D'drive0') - self.assert_qmp(result, 'return', {}) + self.pause_job('drive0', wait=3DFalse) =20 result =3D self.vm.qmp('block-job-set-speed', device=3D'drive0', s= peed=3D0) self.assert_qmp(result, 'return', {}) =20 - self.pause_job('drive0') + self.pause_wait('drive0') =20 result =3D self.vm.qmp('query-block-jobs') offset =3D self.dictpath(result, 'return[0]/offset') @@ -534,11 +531,9 @@ class TestDriveCompression(iotests.QMPTestCase): result =3D self.vm.qmp(cmd, device=3D'drive0', sync=3D'full', comp= ress=3DTrue, **args) self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('block-job-pause', device=3D'drive0') - self.assert_qmp(result, 'return', {}) - + self.pause_job('drive0', wait=3DFalse) self.vm.resume_drive('drive0') - self.pause_job('drive0') + self.pause_wait('drive0') =20 result =3D self.vm.qmp('query-block-jobs') offset =3D self.dictpath(result, 'return[0]/offset') diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 1bcc9ca57d..5303bbc8e2 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -473,10 +473,7 @@ class QMPTestCase(unittest.TestCase): event =3D self.wait_until_completed(drive=3Ddrive) self.assert_qmp(event, 'data/type', 'mirror') =20 - def pause_job(self, job_id=3D'job0'): - result =3D self.vm.qmp('block-job-pause', device=3Djob_id) - self.assert_qmp(result, 'return', {}) - + def pause_wait(self, job_id=3D'job0'): with Timeout(1, "Timeout waiting for job to pause"): while True: result =3D self.vm.qmp('query-block-jobs') @@ -484,6 +481,13 @@ class QMPTestCase(unittest.TestCase): if job['device'] =3D=3D job_id and job['paused'] =3D= =3D True and job['busy'] =3D=3D False: return job =20 + def pause_job(self, job_id=3D'job0', wait=3DTrue): + result =3D self.vm.qmp('block-job-pause', device=3Djob_id) + self.assert_qmp(result, 'return', {}) + if wait: + return self.pause_wait(job_id) + return result + =20 def notrun(reason): '''Skip this test suite''' --=20 2.14.3