packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Reset umask to 022 while creating test repository 

In test-basic-root.sh we make assertions about the permissions
of files like baz/cow, which were created without an explicit chmod.
We can't do that unless we control the permissions.

For some reason the "debomatic" autobuilder used to do some Debian
archive rebuilds does the entire build including build-time tests
as uid 0 with umask 002, which broke those assertions. This seems
a weird thing to do, and I've opened a bug, but it also seems
reasonable to fix this test.

This also lets us remove a couple of existing workarounds for the
same issue.

Bug-Debian: https://bugs.debian.org/876138
Signed-off-by: Simon McVittie <smcv@collabora.com>

Closes: #1192
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2017-09-19 18:37:58 +01:00 committed by Atomic Bot
parent db10bf464f
commit e3c3ec5dd9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/libtest.sh
View File

@ -150,6 +150,8 @@ setup_test_repository () {
export OSTREE="${CMD_PREFIX} ostree ${ot_repo}" export OSTREE="${CMD_PREFIX} ostree ${ot_repo}"
cd ${test_tmpdir} cd ${test_tmpdir}
local oldumask="$(umask)"
umask 022
mkdir files mkdir files
cd files cd files
ot_files=`pwd` ot_files=`pwd`
@ -172,6 +174,7 @@ setup_test_repository () {
ln -s nonexistent baz/alink ln -s nonexistent baz/alink
mkdir baz/another/ mkdir baz/another/
echo x > baz/another/y echo x > baz/another/y
umask "${oldumask}"
cd ${test_tmpdir}/files cd ${test_tmpdir}/files
$OSTREE commit ${COMMIT_ARGS} -b test2 -s "Test Commit 2" -m "Commit body second" $OSTREE commit ${COMMIT_ARGS} -b test2 -s "Test Commit 2" -m "Commit body second"

8
tests/test-basic-user.sh
View File

@ -34,11 +34,7 @@ setup_test_repository "bare-user"
cd ${test_tmpdir} cd ${test_tmpdir}
objpath_nonexec=$(ostree_file_path_to_object_path repo test2 baz/cow) objpath_nonexec=$(ostree_file_path_to_object_path repo test2 baz/cow)
# Sigh, umask assert_file_has_mode ${objpath_nonexec} 644
touch testfile
default_mode=$(stat -c '%a' testfile)
rm testfile
assert_file_has_mode ${objpath_nonexec} ${default_mode}
objpath_ro=$(ostree_file_path_to_object_path repo test2 baz/cowro) objpath_ro=$(ostree_file_path_to_object_path repo test2 baz/cowro)
assert_file_has_mode ${objpath_ro} 600 assert_file_has_mode ${objpath_ro} 600
objpath_exec=$(ostree_file_path_to_object_path repo test2 baz/deeper/ohyeahx) objpath_exec=$(ostree_file_path_to_object_path repo test2 baz/deeper/ohyeahx)
@ -48,7 +44,7 @@ echo "ok bare-user committed modes"
rm test2-checkout -rf rm test2-checkout -rf
$OSTREE checkout -U -H test2 test2-checkout $OSTREE checkout -U -H test2 test2-checkout
cd test2-checkout cd test2-checkout
assert_file_has_mode baz/cow ${default_mode} assert_file_has_mode baz/cow 644
assert_file_has_mode baz/cowro 600 assert_file_has_mode baz/cowro 600
assert_file_has_mode baz/deeper/ohyeahx 755 assert_file_has_mode baz/deeper/ohyeahx 755
echo "ok bare-user checkout modes" echo "ok bare-user checkout modes"