Blob Blame History Raw
From d2b1f0101b75663b8ae31adfb008bdf0b111e873 Mon Sep 17 00:00:00 2001
Message-Id: <d2b1f0101b75663b8ae31adfb008bdf0b111e873@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 20 Jun 2019 17:45:03 +0200
Subject: [PATCH] tests: domainsnapshotxml2xml: make 'disk-seclabel' test
 operational

Now that we added the seclabels to the schema we can test that they are
parsed and formatted correctly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit 3203681e5e8513425acdf3f25d0981f5157f0ddf)

 Conflicts:
tests/domainsnapshotxml2xmltest.c:
  - refactors to the testsuite (a10c6b300e9, 0ea43b55a40, ...) were not
    backported. Test invocation needed to be changed.

https: //bugzilla.redhat.com/show_bug.cgi?id=1584682
Message-Id: <9e8368c18a7b3746dcc750953170771f49453afc.1561045343.git.pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 tests/domainsnapshotxml2xmlout/disk-seclabel.xml | 15 +++++++++++++++
 tests/domainsnapshotxml2xmltest.c                |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 tests/domainsnapshotxml2xmlout/disk-seclabel.xml

diff --git a/tests/domainsnapshotxml2xmlout/disk-seclabel.xml b/tests/domainsnapshotxml2xmlout/disk-seclabel.xml
new file mode 100644
index 0000000000..989cfc4964
--- /dev/null
+++ b/tests/domainsnapshotxml2xmlout/disk-seclabel.xml
@@ -0,0 +1,15 @@
+<domainsnapshot>
+  <name>my snap name</name>
+  <description>!@#$%^</description>
+  <creationTime>581484660</creationTime>
+  <disks>
+    <disk name='hde' snapshot='external' type='file'>
+      <source file='/path/to/new2'>
+        <seclabel model='dac' relabel='no'/>
+      </source>
+    </disk>
+  </disks>
+  <domain>
+    <uuid>9d37b878-a7cc-9f9a-b78f-49b3abad25a8</uuid>
+  </domain>
+</domainsnapshot>
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 5ea0f325de..2b594e626c 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -214,6 +214,7 @@ mymain(void)
     DO_TEST_INOUT("noparent", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", false, false);
     DO_TEST_INOUT("disk_snapshot", NULL, false, false);
     DO_TEST_INOUT("disk_driver_name_null", NULL, false, false);
+    DO_TEST_INOUT("disk-seclabel", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", false, false);
 
     DO_TEST_IN("name_and_description", NULL);
     DO_TEST_IN("description_only", NULL);
-- 
2.22.1