From nobody Tue Nov 11 04:56:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1560993676; cv=none; d=zoho.com; s=zohoarc; b=F6lNPwQ6X2E96ASxw6LYdE0IKBVxon4YCenkWim23K7gdCPTLbtZcOlaBi3glOWDUmuheoo0JzN1XpyUFzoj5f/hG6TmGazBBKL3fesS3SBUXE2ewAdq08rPZ1QZfk0QbNK3d49Bt3X2OCCasawI1fTaxCBegZCIcxBebPB3wo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560993676; 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:ARC-Authentication-Results; bh=Sl9PB/mr/bhNGctWQcZ0xhJsKBcGsBCnXEr3/aARQFg=; b=ZBJnZ+iInHv7wkqns6Sirc7ZJjaK1FK3/KBKEkf/DVyNIxQvjKlj0Tu8GDefEwQvM3hun04wgkbQm5uKSeJXGsS3SLQ1CObruFa2IibcmCOuMHFjz2R73g2CjM0dtPEMtGSWJ2TzXN9MsNPYc0hmJ0SEmneJRPH5PAnL/H46Mrs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1560993676485589.4698607781183; Wed, 19 Jun 2019 18:21:16 -0700 (PDT) Received: from localhost ([::1]:42942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdllL-0008KG-A9 for importer@patchew.org; Wed, 19 Jun 2019 21:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40615) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdle4-0002CF-UO for qemu-devel@nongnu.org; Wed, 19 Jun 2019 21:13:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdlUu-0004uj-Kt for qemu-devel@nongnu.org; Wed, 19 Jun 2019 21:04:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58608) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdlUt-0004tD-Bh; Wed, 19 Jun 2019 21:04:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8CCB9C059B9F; Thu, 20 Jun 2019 01:04:14 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-164.bos.redhat.com [10.18.17.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 735451001E67; Thu, 20 Jun 2019 01:04:13 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Wed, 19 Jun 2019 21:03:53 -0400 Message-Id: <20190620010356.19164-10-jsnow@redhat.com> In-Reply-To: <20190620010356.19164-1-jsnow@redhat.com> References: <20190620010356.19164-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 20 Jun 2019 01:04:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/12] iotests: teach run_job to cancel pending jobs 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 , Fam Zheng , vsementsov@virtuozzo.com, Wen Congyang , Xie Changlong , Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" run_job can cancel pending jobs to simulate failure. This lets us use the pending callback to issue test commands while the job is open, but then still have the job fail in the end. Signed-off-by: John Snow Reviewed-by: Max Reitz --- tests/qemu-iotests/iotests.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index fcad957d63..c544659ecb 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -541,7 +541,22 @@ class VM(qtest.QEMUQtestMachine): =20 # Returns None on success, and an error string on failure def run_job(self, job, auto_finalize=3DTrue, auto_dismiss=3DFalse, - pre_finalize=3DNone, wait=3D60.0): + pre_finalize=3DNone, cancel=3DFalse, wait=3D60.0): + """ + run_job moves a job from creation through to dismissal. + + :param job: String. ID of recently-launched job + :param auto_finalize: Bool. True if the job was launched with + auto_finalize. Defaults to True. + :param auto_dismiss: Bool. True if the job was launched with + auto_dismiss=3DTrue. Defaults to False. + :param pre_finalize: Callback. A callable that takes no arguments = to be + invoked prior to issuing job-finalize, if any. + :param cancel: Bool. When true, cancels the job after the pre_fina= lize + callback. + :param wait: Float. Timeout value specifying how long to wait for = any + event, in seconds. Defaults to 60.0. + """ match_device =3D {'data': {'device': job}} match_id =3D {'data': {'id': job}} events =3D [ @@ -568,7 +583,10 @@ class VM(qtest.QEMUQtestMachine): elif status =3D=3D 'pending' and not auto_finalize: if pre_finalize: pre_finalize() - self.qmp_log('job-finalize', id=3Djob) + if cancel: + self.qmp_log('job-cancel', id=3Djob) + else: + self.qmp_log('job-finalize', id=3Djob) elif status =3D=3D 'concluded' and not auto_dismiss: self.qmp_log('job-dismiss', id=3Djob) elif status =3D=3D 'null': --=20 2.21.0