From nobody Tue Feb 10 11:14:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1654501938; cv=none; d=zohomail.com; s=zohoarc; b=erdfrr16TTdvuz0+4yk3dlFyLP6fS5wD+KtKy0CcO5DwnHnfHCESI6scLTnlD+yEWAuwcmlTagxEcITfCBSSpLg56twBkPXODZKIAoWkQloey8wPgUawfRi+ydSOXwPO2rWSJZ/QB8epBxDjbcwEZyaHW3IgHujNlu2t+ekJRfs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654501938; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TNd9paYlQcyi+CijYYIJb/prKFKoxyPaAS9b4hNo+Bo=; b=WufUYja6nszg1vNkDQRD0J7Nm5xOzQbNCDl432e9irumkXybmF5EjxlzsTWbujZ3kJnNQgbYgoO5l+JRvlAspBDOp9vs20vZiRsBL1eRbgVGfjN6e2HXazYKWsZtfAacRFW7O4ZWCvTTG778t09j88PFSJjIPCNEmysTDEABVQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654501938932609.5399496060193; Mon, 6 Jun 2022 00:52:18 -0700 (PDT) Received: from localhost ([::1]:60218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ny7X6-0007Vt-PX for importer@patchew.org; Mon, 06 Jun 2022 03:52:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny79i-0005LT-N5; Mon, 06 Jun 2022 03:28:09 -0400 Received: from forwardcorp1o.mail.yandex.net ([2a02:6b8:0:1a2d::193]:43322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny79f-0002Z8-2N; Mon, 06 Jun 2022 03:28:05 -0400 Received: from sas1-3cba3404b018.qloud-c.yandex.net (sas1-3cba3404b018.qloud-c.yandex.net [IPv6:2a02:6b8:c08:bd26:0:640:3cba:3404]) by forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id DF81B2E0B02; Mon, 6 Jun 2022 10:27:55 +0300 (MSK) Received: from sas1-7470331623bb.qloud-c.yandex.net (sas1-7470331623bb.qloud-c.yandex.net [2a02:6b8:c08:bd1e:0:640:7470:3316]) by sas1-3cba3404b018.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id HXkQyfoV51-RtKKZs3P; Mon, 06 Jun 2022 10:27:55 +0300 Received: from vsementsov-win.yandex-team.ru (unknown [2a02:6b8:b081:b6b6::1:2c]) by sas1-7470331623bb.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Y8SDrjDjAj-RtM4jkst; Mon, 06 Jun 2022 10:27:55 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) X-Yandex-Fwd: 2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1654500475; bh=TNd9paYlQcyi+CijYYIJb/prKFKoxyPaAS9b4hNo+Bo=; h=Message-Id:References:Date:Subject:In-Reply-To:Cc:To:From; b=bnP8C995fXdr31uoviZO1uZB8O2xUdvhOWg6pbzfIlQbLj17uMUJOV9MWIBXVsAXj i7+0uS2wOYOyqW2j441uaFk5GoNUicdfT/Z8+CY7rqPXoSQD+KUwwKBQEX8xD4MC/a Jy0o8SFiiCgoGmAj+yAQsSKu1Fk7kdd32/+A2PdQ= Authentication-Results: sas1-3cba3404b018.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, eblake@redhat.com, jsnow@redhat.com, Kevin Wolf , Hanna Reitz Subject: [PATCH v2 06/11] iotests: refactor some common qmp result checks into generic pattern Date: Mon, 6 Jun 2022 10:27:26 +0300 Message-Id: <20220606072731.878226-7-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220606072731.878226-1-vsementsov@yandex-team.ru> References: <20220606072731.878226-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a02:6b8:0:1a2d::193; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1o.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1654501940500100001 Content-Type: text/plain; charset="utf-8" To simplify further conversion. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/040 | 3 ++- tests/qemu-iotests/147 | 3 ++- tests/qemu-iotests/155 | 4 ++-- tests/qemu-iotests/218 | 4 ++-- tests/qemu-iotests/296 | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 30eb97829e..2b68946744 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -62,9 +62,10 @@ class ImageCommitTestCase(iotests.QMPTestCase): self.assert_no_active_block_jobs() if node_names: result =3D self.vm.qmp('block-commit', device=3D'drive0', top_= node=3Dtop, base_node=3Dbase) + self.assert_qmp(result, 'return', {}) else: result =3D self.vm.qmp('block-commit', device=3D'drive0', top= =3Dtop, base=3Dbase) - self.assert_qmp(result, 'return', {}) + self.assert_qmp(result, 'return', {}) self.wait_for_complete(need_ready) =20 def run_default_commit_test(self): diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 47dfa62e6b..770b73e2f4 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -159,10 +159,11 @@ class BuiltinNBD(NBDBlockdevAddBase): =20 if export_name is None: result =3D self.server.qmp('nbd-server-add', device=3D'nbd-exp= ort') + self.assert_qmp(result, 'return', {}) else: result =3D self.server.qmp('nbd-server-add', device=3D'nbd-exp= ort', name=3Dexport_name) - self.assert_qmp(result, 'return', {}) + self.assert_qmp(result, 'return', {}) =20 if export_name2 is not None: result =3D self.server.qmp('nbd-server-add', device=3D'nbd-exp= ort', diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155 index eadda52615..d3e1b7401e 100755 --- a/tests/qemu-iotests/155 +++ b/tests/qemu-iotests/155 @@ -181,6 +181,7 @@ class MirrorBaseClass(BaseClass): result =3D self.vm.qmp(self.cmd, job_id=3D'mirror-job', device= =3D'source', sync=3Dsync, target=3D'target', auto_finalize=3DFalse) + self.assert_qmp(result, 'return', {}) else: if self.existing: mode =3D 'existing' @@ -190,8 +191,7 @@ class MirrorBaseClass(BaseClass): sync=3Dsync, target=3Dtarget_img, format=3Diotests.imgfmt, mode=3Dmode, node_name=3D'target', auto_finalize=3DFal= se) - - self.assert_qmp(result, 'return', {}) + self.assert_qmp(result, 'return', {}) =20 self.vm.run_job('mirror-job', auto_finalize=3DFalse, pre_finalize=3Dself.openBacking, auto_dismiss=3DTr= ue) diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218 index 6320c4cb56..5e74c55b6a 100755 --- a/tests/qemu-iotests/218 +++ b/tests/qemu-iotests/218 @@ -61,14 +61,14 @@ def start_mirror(vm, speed=3DNone, buf_size=3DNone): sync=3D'full', speed=3Dspeed, buf_size=3Dbuf_size) + assert ret['return'] =3D=3D {} else: ret =3D vm.qmp('blockdev-mirror', job_id=3D'mirror', device=3D'source', target=3D'target', sync=3D'full') - - assert ret['return'] =3D=3D {} + assert ret['return'] =3D=3D {} =20 =20 log('') diff --git a/tests/qemu-iotests/296 b/tests/qemu-iotests/296 index 0d21b740a7..19a674c5ae 100755 --- a/tests/qemu-iotests/296 +++ b/tests/qemu-iotests/296 @@ -133,9 +133,10 @@ class EncryptionSetupTestCase(iotests.QMPTestCase): =20 if reOpen: result =3D vm.qmp(command, options=3D[opts]) + self.assert_qmp(result, 'return', {}) else: result =3D vm.qmp(command, **opts) - self.assert_qmp(result, 'return', {}) + self.assert_qmp(result, 'return', {}) =20 =20 ######################################################################= ##### --=20 2.25.1