From nobody Mon Feb 9 14:02:58 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=1562175413; cv=none; d=zoho.com; s=zohoarc; b=YKTohFXOzCazWlZHR0OfK+2aWDQLKrvIj01/8vsEbcrSGDqB51LXkgyD6yNFpKx3cDQZ3DwUH6IbZf+5gG62vl1buvDGCF5aEVvf/9T+2oNyx1eeG0DFo4wdzuMINQb7v4uK0euzBY+a5e5kxcfeEoyeIqUR8ahJOT9SBXd7xLY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562175413; 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=dqCBNR2ZpsMODeQJbLH7mpb63m8LUXyFTWK5vRXK288=; b=UX2fBQg9rhBScZ1xiSWmJSrKc4GnAh4XsnbF0N8z6nDUDRvwZg9beR/QQ4bvNLMLqfJF0s2H9D6mvoewxuzc5r7hp58bYgvCq04JJWYBdsOQr8blTxiwP25R6QedzctyReKQx8jp9gj5pQSd2RPmrpCp2NG1q/9x89BilRY0pTg= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 156217541318415.358172803603225; Wed, 3 Jul 2019 10:36:53 -0700 (PDT) Received: from localhost ([::1]:38048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hijBX-0006MW-66 for importer@patchew.org; Wed, 03 Jul 2019 13:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49005) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hij3v-0007hv-1U for qemu-devel@nongnu.org; Wed, 03 Jul 2019 13:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hij3t-0008Se-Sb for qemu-devel@nongnu.org; Wed, 03 Jul 2019 13:28:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hij3r-00083y-G1; Wed, 03 Jul 2019 13:28:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A52573082231; Wed, 3 Jul 2019 17:28:36 +0000 (UTC) Received: from localhost (ovpn-204-65.brq.redhat.com [10.40.204.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40BFA379C; Wed, 3 Jul 2019 17:28:36 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 3 Jul 2019 19:28:10 +0200 Message-Id: <20190703172813.6868-10-mreitz@redhat.com> In-Reply-To: <20190703172813.6868-1-mreitz@redhat.com> References: <20190703172813.6868-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 03 Jul 2019 17:28:36 +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 09/12] iotests: Add @use_log to VM.run_job() 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 , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" unittest-style tests generally do not use the log file, but VM.run_job() can still be useful to them. Add a parameter to it that hides its output from the log file. Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 3ecef5bc90..ce74177ab1 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -542,7 +542,7 @@ 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, use_log=3DTrue, wait=3D60.0): match_device =3D {'data': {'device': job}} match_id =3D {'data': {'id': job}} events =3D [ @@ -557,7 +557,8 @@ class VM(qtest.QEMUQtestMachine): while True: ev =3D filter_qmp_event(self.events_wait(events)) if ev['event'] !=3D 'JOB_STATUS_CHANGE': - log(ev) + if use_log: + log(ev) continue status =3D ev['data']['status'] if status =3D=3D 'aborting': @@ -565,13 +566,20 @@ class VM(qtest.QEMUQtestMachine): for j in result['return']: if j['id'] =3D=3D job: error =3D j['error'] - log('Job failed: %s' % (j['error'])) + if use_log: + log('Job failed: %s' % (j['error'])) elif status =3D=3D 'pending' and not auto_finalize: if pre_finalize: pre_finalize() - self.qmp_log('job-finalize', id=3Djob) + if use_log: + self.qmp_log('job-finalize', id=3Djob) + else: + self.qmp('job-finalize', id=3Djob) elif status =3D=3D 'concluded' and not auto_dismiss: - self.qmp_log('job-dismiss', id=3Djob) + if use_log: + self.qmp_log('job-dismiss', id=3Djob) + else: + self.qmp('job-dismiss', id=3Djob) elif status =3D=3D 'null': return error =20 --=20 2.21.0