shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-10 05:18:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2428 from lucab/ups/tests-selinux-basic

Browse Source 
tests: fix bare mode unprivileged 'make check'
This commit is contained in:
Colin Walters 2021-09-07 15:07:59 -04:00 committed by GitHub
commit 55a7e74fee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/basic-test.sh
View File

@ -435,7 +435,7 @@ echo "ok user checkout"
$OSTREE commit ${COMMIT_ARGS} -b test2 -s "Another commit" --tree=ref=test2
echo "ok commit from ref"
$OSTREE commit ${COMMIT_ARGS} -b test2 -s "Another commit with modifier" --tree=ref=test2 --owner-uid=0
$OSTREE commit ${COMMIT_ARGS} -b test2 -s "Another commit with modifier" --tree=ref=test2 --mode-ro-executables
echo "ok commit from ref with modifier"
$OSTREE commit ${COMMIT_ARGS} -b trees/test2 -s 'ref with / in it' --tree=ref=test2
@ -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
@ -786,7 +793,10 @@ rm files -rf && mkdir files
mkdir files/worldwritable-dir
chmod a+w files/worldwritable-dir
$OSTREE commit ${COMMIT_ARGS} -b content-with-dir-world-writable --tree=dir=files
$OSTREE fsck
# FIXME(lucab): this seems to fail in unprivileged bare mode.
if ! have_selinux_relabel; then
$OSTREE fsck
fi
rm dir-co -rf
$OSTREE checkout -U -H -M content-with-dir-world-writable dir-co
if is_bare_user_only_repo repo; then

2
tests/libtest.sh
View File

@ -609,7 +609,7 @@ have_systemd_and_libmount() {
# https://github.com/ostreedev/ostree/pull/1217
skip_without_no_selinux_or_relabel () {
if ! have_selinux_relabel; then
skip "this test requires xattr support"
skip "this test requires SELinux relabeling support"
fi
}