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

Skip tests that use whiteouts under Docker/aufs 

ostree's naming convention for whiteouts is similar to what is
done in aufs, which means we can't compose the trees to test this
feature under Docker with the aufs storage driver, as used on
travis-ci.

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

Closes: #437
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2016-08-05 20:41:05 +01:00 committed by Atomic Bot
parent 64e4525793
commit 0de51bfc45
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/basic-test.sh
View File

@ -452,38 +452,41 @@ echo "ok test error pre commit/bootid"
# Whiteouts # Whiteouts
cd ${test_tmpdir} cd ${test_tmpdir}
mkdir -p overlay/baz/ mkdir -p overlay/baz/
touch overlay/baz/.wh.cow if touch overlay/baz/.wh.cow && touch overlay/.wh.deeper; then
touch overlay/.wh.deeper touch overlay/anewfile
touch overlay/anewfile mkdir overlay/anewdir/
mkdir overlay/anewdir/ touch overlay/anewdir/blah
touch overlay/anewdir/blah $OSTREE --repo=repo commit -b overlay -s 'overlay' --tree=dir=overlay
$OSTREE --repo=repo commit -b overlay -s 'overlay' --tree=dir=overlay rm overlay -rf
rm overlay -rf
for branch in test2 overlay; do for branch in test2 overlay; do
$OSTREE --repo=repo checkout --union --whiteouts ${branch} overlay-co $OSTREE --repo=repo checkout --union --whiteouts ${branch} overlay-co
done done
for f in .wh.deeper baz/cow baz/.wh.cow; do for f in .wh.deeper baz/cow baz/.wh.cow; do
assert_not_has_file overlay-co/${f} assert_not_has_file overlay-co/${f}
done done
assert_not_has_dir overlay-co/deeper assert_not_has_dir overlay-co/deeper
assert_has_file overlay-co/anewdir/blah assert_has_file overlay-co/anewdir/blah
assert_has_file overlay-co/anewfile assert_has_file overlay-co/anewfile
echo "ok whiteouts enabled" echo "ok whiteouts enabled"
# Now double check whiteouts are not processed without --whiteouts # Now double check whiteouts are not processed without --whiteouts
rm overlay-co -rf rm overlay-co -rf
for branch in test2 overlay; do for branch in test2 overlay; do
$OSTREE --repo=repo checkout --union ${branch} overlay-co $OSTREE --repo=repo checkout --union ${branch} overlay-co
done done
for f in .wh.deeper baz/cow baz/.wh.cow; do for f in .wh.deeper baz/cow baz/.wh.cow; do
assert_has_file overlay-co/${f} assert_has_file overlay-co/${f}
done done
assert_not_has_dir overlay-co/deeper assert_not_has_dir overlay-co/deeper
assert_has_file overlay-co/anewdir/blah assert_has_file overlay-co/anewdir/blah
assert_has_file overlay-co/anewfile assert_has_file overlay-co/anewfile
echo "ok whiteouts disabled" echo "ok whiteouts disabled"
else
echo "ok # SKIP whiteouts do not work, are you using aufs?"
echo "ok # SKIP whiteouts do not work, are you using aufs?"
fi
cd ${test_tmpdir} cd ${test_tmpdir}
rm -rf test2-checkout rm -rf test2-checkout