vircgrouptest: prepare testCgroupDetectMounts for cgroup v2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/vircgroupdata/all-in-one.parsed b/tests/vircgroupdata/all-in-one.parsed
index d703d08fb9df61f00007e5baf6fa365f47a6acd1..97c96e8ecd3bc5c632945c276f8391a71f97453d 100644 (file)
--- a/tests/vircgroupdata/all-in-one.parsed
+++ b/tests/vircgroupdata/all-in-one.parsed
@@ -8,3 +8,4 @@ blkio        /not/really/sys/fs/cgroup
 net_cls      <null>
 perf_event   <null>
 name=systemd <null>
+unified      <null>

diff --git a/tests/vircgroupdata/cgroups1.parsed b/tests/vircgroupdata/cgroups1.parsed
index b6916f17a10806df3046f577cb072a616f395d0b..16431aa0061076f0cf9164e4b89641b2e5781f0f 100644 (file)
--- a/tests/vircgroupdata/cgroups1.parsed
+++ b/tests/vircgroupdata/cgroups1.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   <null>
 name=systemd <null>
+unified      <null>

diff --git a/tests/vircgroupdata/cgroups2.parsed b/tests/vircgroupdata/cgroups2.parsed
index 5eb2bc7bb2f53fa0add02f10b3f30390fec7c344..d1bb0dcb7c23148f6f1411a3ab279ebf795f9265 100644 (file)
--- a/tests/vircgroupdata/cgroups2.parsed
+++ b/tests/vircgroupdata/cgroups2.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      <null>
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd <null>
+unified      <null>

diff --git a/tests/vircgroupdata/cgroups3.parsed b/tests/vircgroupdata/cgroups3.parsed
index 2b1f3825c11902dd09663d0fbfdd9749e6ad4095..44e475c9d2cc1e6432052c88d26b3d08aa56496f 100644 (file)
--- a/tests/vircgroupdata/cgroups3.parsed
+++ b/tests/vircgroupdata/cgroups3.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd <null>
+unified      <null>

diff --git a/tests/vircgroupdata/fedora-18.parsed b/tests/vircgroupdata/fedora-18.parsed
index 8d5ba75c7e535fa5541c2549d26a317eca7a3e18..662a38a9e8c3096cd06d02612d5e3d711bd50df2 100644 (file)
--- a/tests/vircgroupdata/fedora-18.parsed
+++ b/tests/vircgroupdata/fedora-18.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>

diff --git a/tests/vircgroupdata/fedora-21.parsed b/tests/vircgroupdata/fedora-21.parsed
index 3377af0382b74b3a32abba908ad0e61ac2c9ff4f..4e447fd7bd3892abe7371c59dcb46fa4383b4f82 100644 (file)
--- a/tests/vircgroupdata/fedora-21.parsed
+++ b/tests/vircgroupdata/fedora-21.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls,net_prio
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>

diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
index 694870723844b5b2f2a40746268009004f242ac5..bf977f83635466205821253c2c62a9ce21eb9584 100644 (file)
--- a/tests/vircgroupdata/kubevirt.parsed
+++ b/tests/vircgroupdata/kubevirt.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      <null>
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd <null>
+unified      <null>

diff --git a/tests/vircgroupdata/ovirt-node-6.6.parsed b/tests/vircgroupdata/ovirt-node-6.6.parsed
index 01bf466be6d99a93a4af5c16cc1fdf377aa0343d..9d10813d8cd8122b0903f903d5224632605fcabd 100644 (file)
--- a/tests/vircgroupdata/ovirt-node-6.6.parsed
+++ b/tests/vircgroupdata/ovirt-node-6.6.parsed
@@ -8,3 +8,4 @@ blkio        /cgroup/blkio
 net_cls      /cgroup/net_cls
 perf_event   <null>
 name=systemd <null>
+unified      <null>

diff --git a/tests/vircgroupdata/ovirt-node-7.1.parsed b/tests/vircgroupdata/ovirt-node-7.1.parsed
index 8d5ba75c7e535fa5541c2549d26a317eca7a3e18..662a38a9e8c3096cd06d02612d5e3d711bd50df2 100644 (file)
--- a/tests/vircgroupdata/ovirt-node-7.1.parsed
+++ b/tests/vircgroupdata/ovirt-node-7.1.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>

diff --git a/tests/vircgroupdata/rhel-7.1.parsed b/tests/vircgroupdata/rhel-7.1.parsed
index 8d5ba75c7e535fa5541c2549d26a317eca7a3e18..662a38a9e8c3096cd06d02612d5e3d711bd50df2 100644 (file)
--- a/tests/vircgroupdata/rhel-7.1.parsed
+++ b/tests/vircgroupdata/rhel-7.1.parsed
@@ -8,3 +8,4 @@ blkio        /sys/fs/cgroup/blkio
 net_cls      /sys/fs/cgroup/net_cls
 perf_event   /sys/fs/cgroup/perf_event
 name=systemd /sys/fs/cgroup/systemd
+unified      <null>

diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 3e8793a6c383535f251fe4c1b08fe76c05b555ef..75187216d9612699daf7ab3deb2433987410ce50 100644 (file)
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -175,6 +175,8 @@ testCgroupDetectMounts(const void *args)
                           virCgroupControllerTypeToString(i),
                           NULLSTR(group->legacy[i].mountPoint));
     }
+    virBufferAsprintf(&buf, "%-12s %s\n",
+                      "unified", NULLSTR(group->unified.mountPoint));
     if (virBufferCheckError(&buf) < 0)
         goto cleanup;