From 9f5b636990d9a1fb0fc43cedcd96412c515fb679 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 26 Aug 2021 12:47:00 -0400 Subject: [PATCH] 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. --- tests/basic-test.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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