From nobody Mon Feb 9 10:58:15 2026 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=1562192396; cv=none; d=zoho.com; s=zohoarc; b=RtgERG85BgvJtQ1UidG1cJKymLGLI2HYN1kzj6e7KzfKwUc6TDtTZyPvM6y/hZ7gaItCxYIoRbf1MvwaxT4eQ9Y2AMcmIhMvGIKt1vlgUZE2advkeWmqmULdgbNaR/68yMdaRWZzkOrjRw4COG1tsoi43gRBDFvz9JsnuU04ZZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562192396; 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=b4cBRMO3gknhGFhIGkGVaA7RFgOux9RcXh7PmHVW9mL2NteDLTy6wxftrqBDrpu8GRYYKa8/ua5EwExTC83PxFclD3RU2/DCdNz8kaCUwcjgescRAKnQXYgaMvXwwQ8eH/SYMokSDqX/GMq0uiW6G31tD884BoHoMWW51/1FEWw= 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 1562192396588499.1384687382896; Wed, 3 Jul 2019 15:19:56 -0700 (PDT) Received: from localhost ([::1]:41428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hinbX-0008Fq-It for importer@patchew.org; Wed, 03 Jul 2019 18:19:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46384) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hinFJ-00067P-HR for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:56:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hinFI-0004Pm-HW for qemu-devel@nongnu.org; Wed, 03 Jul 2019 17:56:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48308) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hinFF-0004Jr-MD; Wed, 03 Jul 2019 17:56:53 -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 mx1.redhat.com (Postfix) with ESMTPS id 74CE8308213A; Wed, 3 Jul 2019 21:56:51 +0000 (UTC) Received: from probe.redhat.com (ovpn-123-117.rdu2.redhat.com [10.10.123.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CEBD6090E; Wed, 3 Jul 2019 21:56:49 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 17:55:38 -0400 Message-Id: <20190703215542.16123-15-jsnow@redhat.com> In-Reply-To: <20190703215542.16123-1-jsnow@redhat.com> References: <20190703215542.16123-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 03 Jul 2019 21:56:51 +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 v2 14/18] 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, Juan Quintela , John Snow , Xie Changlong , Markus Armbruster , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Wen Congyang , Max Reitz 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