From nobody Sat Feb 7 08:58:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589423223; cv=none; d=zohomail.com; s=zohoarc; b=h1JA+OEQt35XOgGozPwFDJZG+2163k5egZkVOD5fybecXgSCb+5wpjGAT7L2Jt6wf+MiteuVHXRcbtjq7tv+1Vu+cTO2EvUqAfDJK4DqvPpmhgNSmFgRbBw/O0ZjObpv44aSg40FdODPg1/H64pUdRc20cgrhxRDd24V5Wfcws0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589423223; h=Content-Type: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=WfYl0TwQMc5ZPBZYeuBGsbh0WVxyzZyrT23KcuRjoBI=; b=DuUqY2ZP9F+uWqChHZPXVHQfROau97v2AF0SGcgXp76OsDebidWRalCZhU+eBybmYqBxncWgeTZ2CmrYLEkD5L3L7lPM+lp3XLdevVvBaoh0/7YAs9v+olL/cMtxcQb2K8AGYiwg5vSpOeb+k6frVPzjHuJR40z6u/euco+5KaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589423223104474.73275533247056; Wed, 13 May 2020 19:27:03 -0700 (PDT) Received: from localhost ([::1]:54208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ3aP-0001Qn-F3 for importer@patchew.org; Wed, 13 May 2020 22:27:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ3ZL-0008Sm-Gn for qemu-devel@nongnu.org; Wed, 13 May 2020 22:25:55 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:38135 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZ3ZK-00034F-LI for qemu-devel@nongnu.org; Wed, 13 May 2020 22:25:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-cFFc1vafPAaVioojmmk4nA-1; Wed, 13 May 2020 22:25:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2CE211005512; Thu, 14 May 2020 02:25:45 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-9.rdu2.redhat.com [10.10.113.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F4406B8C2; Thu, 14 May 2020 02:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589423153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WfYl0TwQMc5ZPBZYeuBGsbh0WVxyzZyrT23KcuRjoBI=; b=R0EaGMCSQzo45S+I2xPvIdMf7Poe1/h+QP5kkE+PMJynZNXZX0G5sBVr7aQdLsnt7LXgbD RAHswK7GVpCKX1iZxhtS6FVJcL6obgl/tqL4BT4flgcUSQMJbCbYo98ayV+lIezJTa7asV qWWTGHc5zkapNXr7s/uiWYjoSaWYPbQ= X-MC-Unique: cFFc1vafPAaVioojmmk4nA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v4 3/3] iotests: modify test 040 to use JobRunner Date: Wed, 13 May 2020 22:25:36 -0400 Message-Id: <20200514022536.2568-4-jsnow@redhat.com> In-Reply-To: <20200514022536.2568-1-jsnow@redhat.com> References: <20200514022536.2568-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.81; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 22:25:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Eduardo Habkost , qemu-block@nongnu.org, Max Reitz , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of having somewhat reproduced it for itself. Signed-off-by: John Snow --- tests/qemu-iotests/040 | 51 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 90b59081ff..e2ef3bb812 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -483,34 +483,33 @@ class TestErrorHandling(iotests.QMPTestCase): file=3D('top-dbg' if top_debug else 'top-file'), backing=3D'mid-fmt') =20 + + class TestJobRunner(iotests.JobRunner): + expected_events =3D ('BLOCK_JOB_COMPLETED', + 'BLOCK_JOB_ERROR', + 'BLOCK_JOB_READY') + + def __init__(self, *args, test, **kwargs): + super().__init__(*args, **kwargs) + self.log =3D [] + self.test =3D test + + def on_pause(self, event): + super().on_pause(event) + result =3D self._vm.qmp('block-job-resume', device=3Dself._id) + self.test.assert_qmp(result, 'return', {}) + + def on_block_job_event(self, event): + if event['event'] not in self.expected_events: + self.test.fail("Unexpected event: %s" % event) + super().on_block_job_event(event) + self.log.append(event) + def run_job(self, expected_events, error_pauses_job=3DFalse): - match_device =3D {'data': {'device': 'job0'}} - events =3D { - 'BLOCK_JOB_COMPLETED': match_device, - 'BLOCK_JOB_CANCELLED': match_device, - 'BLOCK_JOB_ERROR': match_device, - 'BLOCK_JOB_READY': match_device, - } - - completed =3D False - log =3D [] - while not completed: - ev =3D self.vm.events_wait(events, timeout=3D5.0) - if ev['event'] =3D=3D 'BLOCK_JOB_COMPLETED': - completed =3D True - elif ev['event'] =3D=3D 'BLOCK_JOB_ERROR': - if error_pauses_job: - result =3D self.vm.qmp('block-job-resume', device=3D'j= ob0') - self.assert_qmp(result, 'return', {}) - elif ev['event'] =3D=3D 'BLOCK_JOB_READY': - result =3D self.vm.qmp('block-job-complete', device=3D'job= 0') - self.assert_qmp(result, 'return', {}) - else: - self.fail("Unexpected event: %s" % ev) - log.append(iotests.filter_qmp_event(ev)) - + job =3D self.TestJobRunner(self.vm, 'job0', test=3Dself) + job.run() self.maxDiff =3D None - self.assertEqual(expected_events, log) + self.assertEqual(expected_events, job.log) =20 def event_error(self, op, action): return { --=20 2.21.1