From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E61B3C34026 for ; Tue, 18 Feb 2020 10:40:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B28292173E for ; Tue, 18 Feb 2020 10:40:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HQ7Jlo0z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B28292173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60651 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j40J1-0004CN-UM for qemu-devel@archiver.kernel.org; Tue, 18 Feb 2020 05:40:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52358) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j40EF-0002Aw-Ji for qemu-devel@nongnu.org; Tue, 18 Feb 2020 05:35:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j40EE-0007db-Ba for qemu-devel@nongnu.org; Tue, 18 Feb 2020 05:35:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58427 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j40EE-0007dQ-7D for qemu-devel@nongnu.org; Tue, 18 Feb 2020 05:35:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582022145; 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=fVQnZPVSOrLUX76idZL/c1TGsWgDLcKuCrSjTmmLAuA=; b=HQ7Jlo0zdX7N+M3mgfYcpC4Sa31AEotshLAlzxuqRrnAZLUW5tU+aY7bvAt+Cii0vaO+Zl cB2TFDqWxkirMyOw3tHbFYfvBwsn1QLrb1G7gP+XlQo659zcD1Ny9zDVPJeKIuIRbaFizX xHniU0MfHshQPPV0urDldEYDhAvA++E= 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-165-dHm_5IAnPYSx-tytbnriDw-1; Tue, 18 Feb 2020 05:35:42 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7545477; Tue, 18 Feb 2020 10:35:41 +0000 (UTC) Received: from localhost (unknown [10.36.118.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D54B19E9C; Tue, 18 Feb 2020 10:35:40 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v4 15/19] iotests/041: Drop superfluous shutdowns Date: Tue, 18 Feb 2020 11:34:50 +0100 Message-Id: <20200218103454.296704-16-mreitz@redhat.com> In-Reply-To: <20200218103454.296704-1-mreitz@redhat.com> References: <20200218103454.296704-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: dHm_5IAnPYSx-tytbnriDw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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 , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All tearDowns in 041 shutdown the VM. Thus, test cases do not need to do it themselves (unless they need the VM to be down for some post-operation check). Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/041 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index aa7d54d968..7b2cf5c2f8 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -80,7 +80,6 @@ class TestSingleDrive(iotests.QMPTestCase): self.cancel_and_wait(force=3DTrue) result =3D self.vm.qmp('query-block') self.assert_qmp(result, 'return[0]/inserted/file', test_img) - self.vm.shutdown() =20 def test_cancel_after_ready(self): self.assert_no_active_block_jobs() @@ -201,8 +200,6 @@ class TestSingleDrive(iotests.QMPTestCase): self.assert_qmp(result, 'return[0]/node-name', 'top') self.assert_qmp(result, 'return[0]/backing/node-name', 'base') =20 - self.vm.shutdown() - def test_medium_not_found(self): if iotests.qemu_default_machine !=3D 'pc': return @@ -455,7 +452,6 @@ new_state =3D "1" self.assert_qmp(event, 'data/id', 'drive0') =20 self.assert_no_active_block_jobs() - self.vm.shutdown() =20 def test_ignore_read(self): self.assert_no_active_block_jobs() @@ -475,7 +471,6 @@ new_state =3D "1" result =3D self.vm.qmp('query-block-jobs') self.assert_qmp(result, 'return[0]/paused', False) self.complete_and_wait() - self.vm.shutdown() =20 def test_large_cluster(self): self.assert_no_active_block_jobs() @@ -540,7 +535,6 @@ new_state =3D "1" =20 self.complete_and_wait(wait_ready=3DFalse) self.assert_no_active_block_jobs() - self.vm.shutdown() =20 class TestWriteErrors(iotests.QMPTestCase): image_len =3D 2 * 1024 * 1024 # MB @@ -614,7 +608,6 @@ new_state =3D "1" completed =3D True =20 self.assert_no_active_block_jobs() - self.vm.shutdown() =20 def test_ignore_write(self): self.assert_no_active_block_jobs() @@ -631,7 +624,6 @@ new_state =3D "1" result =3D self.vm.qmp('query-block-jobs') self.assert_qmp(result, 'return[0]/paused', False) self.complete_and_wait() - self.vm.shutdown() =20 def test_stop_write(self): self.assert_no_active_block_jobs() @@ -667,7 +659,6 @@ new_state =3D "1" =20 self.complete_and_wait(wait_ready=3DFalse) self.assert_no_active_block_jobs() - self.vm.shutdown() =20 class TestSetSpeed(iotests.QMPTestCase): image_len =3D 80 * 1024 * 1024 # MB @@ -936,7 +927,6 @@ class TestRepairQuorum(iotests.QMPTestCase): # here we check that the last registered quorum file has not been # swapped out and unref self.assert_has_block_node(None, quorum_img3) - self.vm.shutdown() =20 def test_cancel_after_ready(self): self.assert_no_active_block_jobs() @@ -1043,7 +1033,6 @@ class TestRepairQuorum(iotests.QMPTestCase): self.assert_has_block_node("repair0", quorum_repair_img) # TODO: a better test requiring some QEMU infrastructure will be a= dded # to check that this file is really driven by quorum - self.vm.shutdown() =20 # Test mirroring with a source that does not have any parents (not even a # BlockBackend) --=20 2.24.1