From nobody Wed May 14 01:09:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921225329554.7490153403463; Mon, 21 May 2018 09:47:05 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 9A0C8C8F6B; Mon, 21 May 2018 16:47:03 +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 56873601A3; Mon, 21 May 2018 16:47:03 +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 EB250180B536; Mon, 21 May 2018 16:47:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGkerX002695 for ; Mon, 21 May 2018 12:46:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id E08A52023585; Mon, 21 May 2018 16:46:39 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48E2F2023583; Mon, 21 May 2018 16:46:39 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:46:24 +0100 Message-Id: <20180521164631.7288-7-berrange@redhat.com> In-Reply-To: <20180521164631.7288-1-berrange@redhat.com> References: <20180521164631.7288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 06/13] scripts: cope with multiple seclabels in live XML 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 21 May 2018 16:47:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Libvirt may report two seclabels, one for SELinux and one for DAC. Make sure we grab the right one from the XML. Also fix the number of tests. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- scripts/selinux/100-static-relabel-no.t | 4 ++-- scripts/selinux/110-static-relabel-yes.t | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/selinux/100-static-relabel-no.t b/scripts/selinux/100-= static-relabel-no.t index 8d9fda8..ab52534 100644 --- a/scripts/selinux/100-static-relabel-no.t +++ b/scripts/selinux/100-static-relabel-no.t @@ -62,9 +62,9 @@ SKIP: { my $dom; ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transi= ent domain object"); =20 - my $domainlabel =3D xpath($dom, "string(/domain/seclabel/label)"); + my $domainlabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'se= linux']/label)"); diag "domainlabel $domainlabel"; - my $imagelabel =3D xpath($dom, "string(/domain/seclabel/imagelabel)"); + my $imagelabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'sel= inux']/imagelabel)"); diag "imagelabel $imagelabel"; =20 is($origdomainlabel, $domainlabel, "static label is $domainlabel"); diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110= -static-relabel-yes.t index 76781ca..18350cf 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -28,7 +28,7 @@ and files can be relabelled use strict; use warnings; =20 -use Test::More tests =3D> 5; +use Test::More tests =3D> 6; =20 use Sys::Virt::TCK; use Sys::Virt::TCK::SELinux; @@ -62,9 +62,9 @@ SKIP: { ok_domain(sub { $dom =3D $conn->create_domain($xml) }, "created transi= ent domain object"); =20 diag $dom->get_xml_description(); - my $domainlabel =3D xpath($dom, "string(/domain/seclabel/label)"); + my $domainlabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'se= linux']/label)"); diag "domainlabel $domainlabel"; - my $imagelabel =3D xpath($dom, "string(/domain/seclabel/imagelabel)"); + my $imagelabel =3D xpath($dom, "string(/domain/seclabel[\@model=3D'sel= inux']/imagelabel)"); diag "imagelabel $imagelabel"; my $imagetype =3D selinux_get_type($imagelabel); my $imagemcs =3D selinux_get_mcs($imagelabel); --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list