From: Colin Walters <walters@verbum.org>
Date: Thu, 26 Aug 2021 16:47:00 +0000 (-0400)
Subject: tests/basic: Skip --no-xattrs if we have selinux
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~2^2~4^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9f5b636990d9a1fb0fc43cedcd96412c515fb679;p=ostree.git

tests/basic: Skip --no-xattrs if we have selinux

It cannot work to use `--no-xattrs` when SELinux is enabled
because we get a `security.selinux` attribute on created files
regardless.  So just skip this test if true.

Also add some `ostree fsck`s in here which helped me debug
this.
---

diff --git a/tests/basic-test.sh b/tests/basic-test.sh
index 935544d9..b694f370 100644
--- a/tests/basic-test.sh
+++ b/tests/basic-test.sh
@@ -455,11 +455,18 @@ $OSTREE commit ${COMMIT_ARGS} --skip-if-unchanged -b trees/test2 -s 'should not
 $OSTREE ls -R -C test2
 new_rev=$($OSTREE rev-parse test2)
 assert_streq "${old_rev}" "${new_rev}"
+$OSTREE fsck
 echo "ok commit --skip-if-unchanged"
 
 cd ${test_tmpdir}/checkout-test2-4
+# Unfortunately later tests depend on this right now, so commit anyways
 $OSTREE commit ${COMMIT_ARGS} -b test2 -s "no xattrs" --no-xattrs
-echo "ok commit with no xattrs"
+if have_selinux_relabel; then
+    echo "ok # SKIP we get an injected security.selinux xattr regardless, so we can't do this"
+else
+    $OSTREE fsck
+    echo "ok commit with no xattrs"
+fi
 
 mkdir tree-A tree-B
 touch tree-A/file-a tree-B/file-b