From nobody Mon Feb 9 20:34:23 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=1598972178; cv=none; d=zohomail.com; s=zohoarc; b=SVX6EYIJiMeWXs4ob0clr1VdV6de6bCRnvEOECNh9YsTXQ1dne1mkSjVeB2AEqYyGQtHS0MYT5+tEIjuW/vVCnbAcW+B9/HyXkWLXQ5yuE2Gx3myb/3ppAdqfBvFDrqSkFlB6tKcz5GcBvYsc9Ve0V1yeryF7fclqV7pRBlXTLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598972178; 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=SVbs/jm54wzpCPp1bOuM2UFI4F7Icj8UBnILl8cNZKU=; b=B+ZnwcCSwqpzhXMqVuX6utF+k3cNjVO1ckq+k/05jBAHuNf4U7bsv/WHVwur6IGfGXur9EhRxPCbOzMg9vMMuNZo6nlyA4brQTffxUA2lR6+3APZBVkPUQHl4BIone3RPQ/PFdqnhd8LG6Zld2MkXLTRVCdEXNkeYE8d7nRnokQ= 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 1598972178153575.0623904486547; Tue, 1 Sep 2020 07:56:18 -0700 (PDT) Received: from localhost ([::1]:59538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7ho-0000SR-Tv for importer@patchew.org; Tue, 01 Sep 2020 10:56:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD7ON-0001kJ-8t for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:36:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54343 helo=us-smtp-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 1kD7OH-0007UT-Jm for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:36:10 -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-197-Sw617yusPZylI2MAoeVphw-1; Tue, 01 Sep 2020 10:36:03 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B3378015DB; Tue, 1 Sep 2020 14:36:02 +0000 (UTC) Received: from localhost (ovpn-113-83.ams2.redhat.com [10.36.113.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB4051002D58; Tue, 1 Sep 2020 14:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598970965; 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=SVbs/jm54wzpCPp1bOuM2UFI4F7Icj8UBnILl8cNZKU=; b=Wlo8AAvMlWOM/2G2ONjtJI9wPv7sZbcXfflo1Xrvz3VvQmOPocpmxPqjb4EKLIRMKX5mXh BCT04cBnsJxWheLPWj3KnyACqftg+j42aoy0tWrFoIFgVtbsNdZ/x6RffO8WfE4tncHRyj 2wKTZAOERmCb/nscvYxvKT5ntRjusu0= X-MC-Unique: Sw617yusPZylI2MAoeVphw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v8 39/43] iotests: Let complete_and_wait() work with commit Date: Tue, 1 Sep 2020 16:34:20 +0200 Message-Id: <20200901143424.884735-40-mreitz@redhat.com> In-Reply-To: <20200901143424.884735-1-mreitz@redhat.com> References: <20200901143424.884735-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 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.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 00:57:59 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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 , Andrey Shinkevich , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz 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" complete_and_wait() and wait_ready() currently only work for mirror jobs. Let them work for active commit jobs, too. Signed-off-by: Max Reitz Reviewed-by: Andrey Shinkevich Reviewed-by: Kevin Wolf --- tests/qemu-iotests/iotests.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index e197c73ca5..64ccaf9061 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -972,8 +972,12 @@ class QMPTestCase(unittest.TestCase): =20 def wait_ready(self, drive=3D'drive0'): """Wait until a BLOCK_JOB_READY event, and return the event.""" - f =3D {'data': {'type': 'mirror', 'device': drive}} - return self.vm.event_wait(name=3D'BLOCK_JOB_READY', match=3Df) + return self.vm.events_wait([ + ('BLOCK_JOB_READY', + {'data': {'type': 'mirror', 'device': drive}}), + ('BLOCK_JOB_READY', + {'data': {'type': 'commit', 'device': drive}}) + ]) =20 def wait_ready_and_cancel(self, drive=3D'drive0'): self.wait_ready(drive=3Ddrive) @@ -992,7 +996,7 @@ class QMPTestCase(unittest.TestCase): self.assert_qmp(result, 'return', {}) =20 event =3D self.wait_until_completed(drive=3Ddrive, error=3Dcomplet= ion_error) - self.assert_qmp(event, 'data/type', 'mirror') + self.assertTrue(event['data']['type'] in ['mirror', 'commit']) =20 def pause_wait(self, job_id=3D'job0'): with Timeout(3, "Timeout waiting for job to pause"): --=20 2.26.2