From nobody Sun Feb 8 21:33:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600344004; cv=none; d=zohomail.com; s=zohoarc; b=F83CXQzlmAg19YLyajtqboY+5aYuwOuv/uQRZDr3mx6FK2JzSIJLaqzuV/GtCJSLi0uWCZgXLkUWv/DcbEOLtduSc3E/90tjYMkVBB3kdXeM2/Ju8DMJ76C39eSQnoeXrk5EQ/R2gljEvTHtBX4RMKVzXDEIMi9ycrw3h2nTILs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600344004; h=Content-Type:Content-Transfer-Encoding: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=ghfm/5QVfYeYCQmV/PTi7A70oAhx0b/JwdECv+oGW74=; b=HhhHN8CahUD82JvFNC2/T17debUchqVx/PoUYnwi/6JQQGXHhOUatljG8anz5eUkc2n06/Uss1c+AL15ZgRTupCFXgVOEK2hodX3v6vnRqvmDqNINL8gxbqosb5R31zrKqXGcxapbGpQ1UvqHyhBPxT7gglM0M99HyNBKp10rN8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600344004179381.28732114748016; Thu, 17 Sep 2020 05:00:04 -0700 (PDT) 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-474-0oJ4SYsmN4GFMSqqsVAukw-1; Thu, 17 Sep 2020 07:59:43 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A25A6409C; Thu, 17 Sep 2020 11:59:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB8287EEDA; Thu, 17 Sep 2020 11:59:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B1612183D041; Thu, 17 Sep 2020 11:59:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08HBxNco027463 for ; Thu, 17 Sep 2020 07:59:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id D75837EEB4; Thu, 17 Sep 2020 11:59:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-29.ams2.redhat.com [10.36.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14EF17EEDA; Thu, 17 Sep 2020 11:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600344003; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ghfm/5QVfYeYCQmV/PTi7A70oAhx0b/JwdECv+oGW74=; b=JOMqwT6XLb2EQqGmyFrnztCvAkI5bl3cwCq28A7naEqnQri23IIsrI/7BzBvv0vhsOSzyK S5ywLEw+vqcuN/vo/bRz7N19kgqavhlzQGDjN61/4GRIrvR/uhYxZRJtrT8d5T7xIbgAjW Rs5sCzpXdXAZAVQUqc4GrWNTm6haeOc= X-MC-Unique: 0oJ4SYsmN4GFMSqqsVAukw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/4] tests: remove redundant LUKS volume data files Date: Thu, 17 Sep 2020 12:59:07 +0100 Message-Id: <20200917115908.1615571-4-berrange@redhat.com> In-Reply-To: <20200917115908.1615571-1-berrange@redhat.com> References: <20200917115908.1615571-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The two removed files have exactly the same config as other LUKS volume data files, simply with different file names. Consolidate down to just two LUKS volume data files as that's all that we need for the test coverage. Signed-off-by: Daniel P. Berrang=C3=A9 --- .../luks-convert-encrypt.argv | 18 ++++++++-------- .../luks-convert-encrypt2fileqcow2.argv | 6 +++--- .../luks-convert-encrypt2fileraw.argv | 6 +++--- tests/storagevolxml2argvtest.c | 8 +++---- tests/storagevolxml2xmlin/vol-encrypt1.xml | 21 ------------------- tests/storagevolxml2xmlin/vol-encrypt2.xml | 21 ------------------- 6 files changed, 19 insertions(+), 61 deletions(-) delete mode 100644 tests/storagevolxml2xmlin/vol-encrypt1.xml delete mode 100644 tests/storagevolxml2xmlin/vol-encrypt2.xml diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv b/tests= /storagevolxml2argvdata/luks-convert-encrypt.argv index b2ad16b7cb..78bce96aaa 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt.argv @@ -1,11 +1,11 @@ qemu-img create -f luks \ ---object secret,id=3Dencrypt2.img_encrypt0,file=3D/path/to/secretFile \ --o key-secret=3Dencrypt2.img_encrypt0 \ -/var/lib/libvirt/images/encrypt2.img 5242880K +--object secret,id=3DLuksDemo.img_encrypt0,file=3D/path/to/secretFile \ +-o key-secret=3DLuksDemo.img_encrypt0 \ +/var/lib/libvirt/images/LuksDemo.img 5242880K qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=3Dencrypt2.img_encrypt0,file=3D/path/to/secretFile \ ---object secret,id=3Dencrypt1.img_encrypt0,file=3D/path/to/inputSecretFile= \ -driver=3Dluks,file.filename=3D/var/lib/libvirt/images/encrypt1.img,\ -key-secret=3Dencrypt1.img_encrypt0 \ -driver=3Dluks,file.filename=3D/var/lib/libvirt/images/encrypt2.img,\ -key-secret=3Dencrypt2.img_encrypt0 +--object secret,id=3DLuksDemo.img_encrypt0,file=3D/path/to/secretFile \ +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/inputSecretFil= e \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ +key-secret=3DOtherDemo.img_encrypt0 \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/LuksDemo.img,\ +key-secret=3DLuksDemo.img_encrypt0 diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.ar= gv b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv index 82cb364b61..fd974f863e 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv @@ -1,7 +1,7 @@ qemu-img create -f qcow2 \ -o compat=3D0.10 /var/lib/libvirt/images/sparse-qcow2.img 1073741824K qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=3Dencrypt2.img_encrypt0,file=3D/path/to/inputSecretFile= \ -driver=3Dluks,file.filename=3D/var/lib/libvirt/images/encrypt2.img,\ -key-secret=3Dencrypt2.img_encrypt0 \ +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/inputSecretFil= e \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ +key-secret=3DOtherDemo.img_encrypt0 \ driver=3Dqcow2,file.filename=3D/var/lib/libvirt/images/sparse-qcow2.img diff --git a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv= b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv index 2661c345a8..82473db57b 100644 --- a/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv +++ b/tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv @@ -1,7 +1,7 @@ qemu-img create -f raw \ /var/lib/libvirt/images/sparse.img 1073741824K qemu-img convert --image-opts -n --target-image-opts \ ---object secret,id=3Dencrypt2.img_encrypt0,file=3D/path/to/inputSecretFile= \ -driver=3Dluks,file.filename=3D/var/lib/libvirt/images/encrypt2.img,\ -key-secret=3Dencrypt2.img_encrypt0 \ +--object secret,id=3DOtherDemo.img_encrypt0,file=3D/path/to/inputSecretFil= e \ +driver=3Dluks,file.filename=3D/var/lib/libvirt/images/OtherDemo.img,\ +key-secret=3DOtherDemo.img_encrypt0 \ driver=3Draw,file.filename=3D/var/lib/libvirt/images/sparse.img diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 1832690e29..618f481039 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -264,16 +264,16 @@ mymain(void) "pool-dir", "vol-file-qcow2", "luks-convert-qcow2", 0); =20 - DO_TEST("pool-dir", "vol-encrypt2", - "pool-dir", "vol-encrypt1", + DO_TEST("pool-dir", "vol-luks", + "pool-dir", "vol-luks-convert", "luks-convert-encrypt", 0); =20 DO_TEST("pool-dir", "vol-file", - "pool-dir", "vol-encrypt2", + "pool-dir", "vol-luks-convert", "luks-convert-encrypt2fileraw", 0); =20 DO_TEST("pool-dir", "vol-file-qcow2", - "pool-dir", "vol-encrypt2", + "pool-dir", "vol-luks-convert", "luks-convert-encrypt2fileqcow2", 0); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/storagevolxml2xmlin/vol-encrypt1.xml b/tests/storagevolx= ml2xmlin/vol-encrypt1.xml deleted file mode 100644 index 681734dc7b..0000000000 --- a/tests/storagevolxml2xmlin/vol-encrypt1.xml +++ /dev/null @@ -1,21 +0,0 @@ - - encrypt1.img - /var/lib/libvirt/images/encrypt1.img - - - 5 - 294912 - - /var/lib/libvirt/images/encrypt1.img - - - 0644 - 0 - 0 - - - - - - - diff --git a/tests/storagevolxml2xmlin/vol-encrypt2.xml b/tests/storagevolx= ml2xmlin/vol-encrypt2.xml deleted file mode 100644 index 0507d3b9e6..0000000000 --- a/tests/storagevolxml2xmlin/vol-encrypt2.xml +++ /dev/null @@ -1,21 +0,0 @@ - - encrypt2.img - /var/lib/libvirt/images/encrypt2.img - - - 5 - 294912 - - /var/lib/libvirt/images/encrypt2.img - - - 0644 - 0 - 0 - - - - - - - --=20 2.26.2