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

test-basic-user-only: Skip final step if no user xattrs 

We don't want to skip the entire test, because the whole point of
bare-user-only is that it works in the absence of xattrs; but we do
need to skip this last stage, which explicitly uses a bare-user
repository.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #1120
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2017-08-29 17:03:37 +01:00 committed by Atomic Bot
parent 41e6871e51
commit 3fcd81df86
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/test-basic-user-only.sh
View File

@ -72,21 +72,23 @@ $CMD_PREFIX ostree --repo=repo checkout -U -H content-with-dir-world-writable di
assert_file_has_mode dir-co/worldwritable-dir 775
echo "ok didn't make world-writable dir"
cd ${test_tmpdir}
rm repo-input -rf
rm repo -rf
ostree_repo_init repo init --mode=bare-user-only
ostree_repo_init repo-input init --mode=bare-user
rm files -rf && mkdir files
echo afile > files/afile
ln -s afile files/afile-link
$CMD_PREFIX ostree --repo=repo-input commit --canonical-permissions -b testtree --tree=dir=files
afile_relobjpath=$(ostree_file_path_to_relative_object_path repo-input testtree /afile)
afile_link_relobjpath=$(ostree_file_path_to_relative_object_path repo-input testtree /afile-link)
$CMD_PREFIX ostree pull-local --repo=repo repo-input
assert_files_hardlinked repo/${afile_relobjpath} repo-input/${afile_relobjpath}
if files_are_hardlinked repo/${afile_link_relobjpath} repo-input/${afile_link_relobjpath}; then
if ! skip_one_without_user_xattrs; then
cd ${test_tmpdir}
rm repo-input -rf
rm repo -rf
ostree_repo_init repo init --mode=bare-user-only
ostree_repo_init repo-input init --mode=bare-user
rm files -rf && mkdir files
echo afile > files/afile
ln -s afile files/afile-link
$CMD_PREFIX ostree --repo=repo-input commit --canonical-permissions -b testtree --tree=dir=files
afile_relobjpath=$(ostree_file_path_to_relative_object_path repo-input testtree /afile)
afile_link_relobjpath=$(ostree_file_path_to_relative_object_path repo-input testtree /afile-link)
$CMD_PREFIX ostree pull-local --repo=repo repo-input
assert_files_hardlinked repo/${afile_relobjpath} repo-input/${afile_relobjpath}
if files_are_hardlinked repo/${afile_link_relobjpath} repo-input/${afile_link_relobjpath}; then
assert_not_reached "symlinks hardlinked across bare-user?"
fi
$OSTREE fsck -q
echo "ok hardlink pull from bare-user"
fi
$OSTREE fsck -q
echo "ok hardlink pull from bare-user"