From nobody Tue Feb 10 01:33:26 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=1602072439; cv=none; d=zohomail.com; s=zohoarc; b=VWbvztTisckZnLlDdXz116u6vhh1TywJClvVQil4zf8l655VxUj2dhiC+rhoKCN9UoWbuuUA3rPtpPLDfni4azyQEL6o1PV5fWL0d0zXfSS+Ac7SMWld7ui/TX0DioMbRGHA1irrXmeX68eXvCAQqKZifChFL4U2LdLKhbCDBvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602072439; 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=22Qsmi4XFKCBVOTxJQOM0XpcwaYo5VRpQRb9bg3qLkc=; b=dZI4hBizPvqo/TwGeam/S460OhOdFkBQ7/d5OK8ChMOU9+KvvRRKLb/HWoBOBxVnnrt+MnxJFH9WxRnxfZjp4ssNuy1sBHtLoZ8Krfy9I32T6fMUfIlk1jSQQyiKOofXZFiW8HchOpiD7DKH7FbEp96alR6sx/ckufRD0riUanQ= 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 1602072439822949.3035389371516; Wed, 7 Oct 2020 05:07:19 -0700 (PDT) Received: from localhost ([::1]:42270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQ8E2-0005QZ-B7 for importer@patchew.org; Wed, 07 Oct 2020 08:07:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ84J-0001VU-9b for qemu-devel@nongnu.org; Wed, 07 Oct 2020 07:57:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQ84F-0001hH-6u for qemu-devel@nongnu.org; Wed, 07 Oct 2020 07:57:14 -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-18-TUaxWs6NNtOMpnagtnSLtw-1; Wed, 07 Oct 2020 07:57:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82D441007469; Wed, 7 Oct 2020 11:57:07 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2503555760; Wed, 7 Oct 2020 11:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602071830; 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=22Qsmi4XFKCBVOTxJQOM0XpcwaYo5VRpQRb9bg3qLkc=; b=I3S2anLGI+GKUSzh/3wqtfIiQ2GTqZXXtR7UQpsJbF5qj5gl6jL85z0c0vO6UgAeKc0+Z0 2Tt0YZdrDUVzvVNoKfMJohSSH3oXKycZvbSUznKIShB+mVEhGuOjBxTIfd7/6eF3mc6tqO /jSEEr8uq8DfrNwgDitEI/xGYaYsO4Q= X-MC-Unique: TUaxWs6NNtOMpnagtnSLtw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v8 06/17] qtest: check that drives are really appearing and disappearing Date: Wed, 7 Oct 2020 07:56:49 -0400 Message-Id: <20201007115700.707938-7-pbonzini@redhat.com> In-Reply-To: <20201007115700.707938-1-pbonzini@redhat.com> References: <20201007115700.707938-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 00:44:56 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.742, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com 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" Do not just trust the HMP commands to create and delete the drive, use query-block to check that this is actually the case. Signed-off-by: Paolo Bonzini Reviewed-by: Kevin Wolf --- tests/qtest/drive_del-test.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c index 9d20a1ed8b..ff772b3671 100644 --- a/tests/qtest/drive_del-test.c +++ b/tests/qtest/drive_del-test.c @@ -14,20 +14,49 @@ #include "libqos/libqtest.h" #include "libqos/virtio.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" + +static bool has_drive(QTestState *qts) +{ + QDict *response; + QList *ret; + QListEntry *entry; + bool found; + + response =3D qtest_qmp(qts, "{'execute': 'query-block'}"); + g_assert(response && qdict_haskey(response, "return")); + ret =3D qdict_get_qlist(response, "return"); + + found =3D false; + QLIST_FOREACH_ENTRY(ret, entry) { + QDict *entry_dict =3D qobject_to(QDict, entry->value); + if (!strcmp(qdict_get_str(entry_dict, "device"), "drive0")) { + found =3D true; + break; + } + } + + qobject_unref(response); + return found; +} =20 static void drive_add(QTestState *qts) { char *resp =3D qtest_hmp(qts, "drive_add 0 if=3Dnone,id=3Ddrive0"); =20 g_assert_cmpstr(resp, =3D=3D, "OK\r\n"); + g_assert(has_drive(qts)); g_free(resp); } =20 static void drive_del(QTestState *qts) { - char *resp =3D qtest_hmp(qts, "drive_del drive0"); + char *resp; =20 + g_assert(has_drive(qts)); + resp =3D qtest_hmp(qts, "drive_del drive0"); g_assert_cmpstr(resp, =3D=3D, ""); + g_assert(!has_drive(qts)); g_free(resp); } =20 @@ -130,6 +159,7 @@ static void test_drive_del_device_del(void) */ drive_del(qts); device_del(qts); + g_assert(!has_drive(qts)); =20 qtest_quit(qts); } --=20 2.26.2