diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-08-29 17:03:37 +0100 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-29 19:08:59 +0000 |
| commit | 3fcd81df86b66c5abb61118d2ef3822304cb5da3 (patch) | |
| tree | 146c5622152646e1efde3d88f1fbb8acc57157c6 /tests/test-basic-user-only.sh | |
| parent | 41e6871e514dda1392354f642edb3484cf79af47 (diff) | |
| download | ostree-3fcd81df86b66c5abb61118d2ef3822304cb5da3.tar.gz | |
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
Diffstat (limited to 'tests/test-basic-user-only.sh')
| -rwxr-xr-x | tests/test-basic-user-only.sh | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh index fb071fe4..ce69e49e 100755 --- a/tests/test-basic-user-only.sh +++ b/tests/test-basic-user-only.sh @@ -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 - assert_not_reached "symlinks hardlinked across bare-user?" +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" |