From nobody Sun Feb 8 09:32:32 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=1617972748; cv=none; d=zohomail.com; s=zohoarc; b=bajijhwu4UB+x6Lk3fymMH6upFXQndBy0eexVnldpQIEo/r1hShgnXOWWA8EXmA2ZULDQ7S/Gjc6DrK8efy2jC3kJji/8xA6RSKjV+ojtpSRsKpplgyektWxbRD4OFfxYh1MJEbykEbZjsm2cApfUnJSkxJ/hMs55QK7st0APSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617972748; 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=BIDX81WIIhDQmP2jAk782v1RjQJ+UY3EnleTSCVEDYY=; b=Sly7sDEsUCHByttbWDETJaYlMDadyfAqjElyZBJ58UcFzgAd+HvJBJNkNYfVHxoc6sPqa98ocRlto+bCtk3IxgIhlPuWOZt1Q98wTTqw1oMbsVJAJOXV4fY22fdiEMojm6Fbhqh4UFjFAAGfDleXVO4/n8cjsqtsvFFli8H7JX8= 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 1617972748922279.2097462883369; Fri, 9 Apr 2021 05:52:28 -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-147-KOPeGgG1P22BJnOjV4sF5w-1; Fri, 09 Apr 2021 08:52:25 -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 A88331883532; Fri, 9 Apr 2021 12:52:19 +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 820F310246F1; Fri, 9 Apr 2021 12:52:19 +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 1CA8818095C9; Fri, 9 Apr 2021 12:52:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 139CqIX3009183 for ; Fri, 9 Apr 2021 08:52:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 45EB518219; Fri, 9 Apr 2021 12:52:18 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id A78325C5E0 for ; Fri, 9 Apr 2021 12:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617972747; 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=BIDX81WIIhDQmP2jAk782v1RjQJ+UY3EnleTSCVEDYY=; b=VoumE3GFmR/5CHg8tFGQ69ze4dGM0vBNBiWOvrb435hFUuptpytVcw0b+t7HLn52Hwf0tY ralnqAxE+hGhl01dGO8MfNtA6KxZeW6iai0tjrNaahoJQn9Atp5n1CthFcdmmB213X+cfV PRvEzbT4vSWlryp/2O8LOw1xituAF5s= X-MC-Unique: KOPeGgG1P22BJnOjV4sF5w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 19/25] storagepoolxml2argvtest: Use internal wrapping of command line arguments Date: Fri, 9 Apr 2021 14:50:21 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" virCommandToString has the possibility to return an already wrapped string with better format than what we get from the test wrapper script. Signed-off-by: Peter Krempa --- tests/storagepoolxml2argvdata/pool-fs-linux.argv | 4 +++- tests/storagepoolxml2argvdata/pool-fs.argv | 5 ++++- tests/storagepoolxml2argvdata/pool-logical-create.argv | 3 ++- tests/storagepoolxml2argvdata/pool-logical-noname.argv | 3 ++- tests/storagepoolxml2argvdata/pool-logical-nopath.argv | 3 ++- tests/storagepoolxml2argvdata/pool-logical.argv | 3 ++- tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv | 4 +++- tests/storagepoolxml2argvdata/pool-netfs-auto.argv | 4 +++- tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv | 4 +++- tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv | 4 +++- tests/storagepoolxml2argvdata/pool-netfs-linux.argv | 4 +++- .../pool-netfs-ns-mountopts-linux.argv | 4 +++- .../pool-netfs-protocol-ver-linux.argv | 4 +++- tests/storagepoolxml2argvdata/pool-netfs.argv | 5 ++++- tests/storagepoolxml2argvtest.c | 4 ++-- 15 files changed, 42 insertions(+), 16 deletions(-) diff --git a/tests/storagepoolxml2argvdata/pool-fs-linux.argv b/tests/stora= gepoolxml2argvdata/pool-fs-linux.argv index 6d014320cf..99cc8ee77f 100644 --- a/tests/storagepoolxml2argvdata/pool-fs-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-fs-linux.argv @@ -1,3 +1,5 @@ mount \ -o nodev,nosuid,noexec \ --t ext3 /dev/sda6 /mnt +-t ext3 \ +/dev/sda6 \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-fs.argv b/tests/storagepool= xml2argvdata/pool-fs.argv index 537ce4cee5..8254863b57 100644 --- a/tests/storagepoolxml2argvdata/pool-fs.argv +++ b/tests/storagepoolxml2argvdata/pool-fs.argv @@ -1 +1,4 @@ -mount -t ext3 /dev/sda6 /mnt +mount \ +-t ext3 \ +/dev/sda6 \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-logical-create.argv b/tests= /storagepoolxml2argvdata/pool-logical-create.argv index 8c7f8c93f9..e22c05beb9 100644 --- a/tests/storagepoolxml2argvdata/pool-logical-create.argv +++ b/tests/storagepoolxml2argvdata/pool-logical-create.argv @@ -1 +1,2 @@ -vgchange -aly HostVG +vgchange \ +-aly HostVG diff --git a/tests/storagepoolxml2argvdata/pool-logical-noname.argv b/tests= /storagepoolxml2argvdata/pool-logical-noname.argv index 9f7eda00bd..90fa7b6f02 100644 --- a/tests/storagepoolxml2argvdata/pool-logical-noname.argv +++ b/tests/storagepoolxml2argvdata/pool-logical-noname.argv @@ -1 +1,2 @@ -vgchange -aly zily +vgchange \ +-aly zily diff --git a/tests/storagepoolxml2argvdata/pool-logical-nopath.argv b/tests= /storagepoolxml2argvdata/pool-logical-nopath.argv index 8c7f8c93f9..e22c05beb9 100644 --- a/tests/storagepoolxml2argvdata/pool-logical-nopath.argv +++ b/tests/storagepoolxml2argvdata/pool-logical-nopath.argv @@ -1 +1,2 @@ -vgchange -aly HostVG +vgchange \ +-aly HostVG diff --git a/tests/storagepoolxml2argvdata/pool-logical.argv b/tests/storag= epoolxml2argvdata/pool-logical.argv index 8c7f8c93f9..e22c05beb9 100644 --- a/tests/storagepoolxml2argvdata/pool-logical.argv +++ b/tests/storagepoolxml2argvdata/pool-logical.argv @@ -1 +1,2 @@ -vgchange -aly HostVG +vgchange \ +-aly HostVG diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv b/tes= ts/storagepoolxml2argvdata/pool-netfs-auto-linux.argv index b5e455090a..9974aea273 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv @@ -1,2 +1,4 @@ mount \ --o nodev,nosuid,noexec localhost:/var/lib/libvirt/images /mnt +-o nodev,nosuid,noexec \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto.argv b/tests/sto= ragepoolxml2argvdata/pool-netfs-auto.argv index 888a0161b8..e49233cd93 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-auto.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-auto.argv @@ -1 +1,3 @@ -mount localhost:/var/lib/libvirt/images /mnt +mount \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv b/tes= ts/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv index feb20d7bc8..3432ab11bd 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv @@ -1,3 +1,5 @@ mount \ -o nodev,nosuid,noexec,guest \ --t cifs //example.com/samba_share /mnt/cifs +-t cifs \ +//example.com/samba_share \ +/mnt/cifs diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv b/= tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv index 4524bc921a..e622e0eb95 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv @@ -1,3 +1,5 @@ mount \ -o nodev,nosuid,noexec,direct-io-mode=3D1 \ --t glusterfs example.com:/volume /mnt/gluster +-t glusterfs \ +example.com:/volume \ +/mnt/gluster diff --git a/tests/storagepoolxml2argvdata/pool-netfs-linux.argv b/tests/st= oragepoolxml2argvdata/pool-netfs-linux.argv index ce0d88cfac..4012b04d7d 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-linux.argv @@ -1,3 +1,5 @@ mount \ -o nodev,nosuid,noexec \ --t nfs localhost:/var/lib/libvirt/images /mnt +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.ar= gv b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv index 517fdbb080..433b39d0e2 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv @@ -1,3 +1,5 @@ mount \ -o nodev,nosuid,noexec,nfsvers=3D3,sync,lazytime \ --t nfs localhost:/var/lib/libvirt/images /mnt +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.ar= gv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv index fc1d91c614..dac46a074f 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv @@ -1,3 +1,5 @@ mount \ -o nodev,nosuid,noexec,nfsvers=3D3 \ --t nfs localhost:/var/lib/libvirt/images /mnt +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs.argv b/tests/storagep= oolxml2argvdata/pool-netfs.argv index 04127c5087..0ed31b642b 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs.argv @@ -1 +1,4 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt +mount \ +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 0279437f63..58fb14b8b2 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -74,12 +74,12 @@ testCompareXMLToArgvFiles(bool shouldFail, goto cleanup; }; - if (!(actualCmdline =3D virCommandToStringFull(cmd, false, true))) { + if (!(actualCmdline =3D virCommandToStringFull(cmd, true, true))) { VIR_TEST_DEBUG("pool type '%s' failed to get commandline", defType= Str); goto cleanup; } - if (virTestCompareToFile(actualCmdline, cmdline) < 0) + if (virTestCompareToFileFull(actualCmdline, cmdline, false) < 0) goto cleanup; ret =3D 0; --=20 2.30.2