diff options
| author | Colin Walters <walters@verbum.org> | 2014-06-19 15:53:20 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-06-20 13:43:12 -0400 |
| commit | b2329cf87536482c03c1babbc183c098bd8a53ba (patch) | |
| tree | 7acd46a0d988272ad6290c81a632c4c8fcaaf1b0 | |
| parent | 39e4c7c6fe3f733eac715db202a97d6c2c1e5d22 (diff) | |
| download | ostree-b2329cf87536482c03c1babbc183c098bd8a53ba.tar.gz | |
tests: Add a test for an empty /etc directory gaining content
https://bugzilla.gnome.org/show_bug.cgi?id=731924
| -rw-r--r-- | tests/test-admin-deploy-etcmerge-cornercases.sh | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/tests/test-admin-deploy-etcmerge-cornercases.sh b/tests/test-admin-deploy-etcmerge-cornercases.sh index 033e5599..09386aa2 100644 --- a/tests/test-admin-deploy-etcmerge-cornercases.sh +++ b/tests/test-admin-deploy-etcmerge-cornercases.sh @@ -27,7 +27,7 @@ setup_os_repository "archive-z2" "syslinux" echo "ok setup" -echo "1..1" +echo "1..2" ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime rev=$(ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) @@ -71,3 +71,28 @@ assert_file_has_mode ${newetc}/a/long/dir/forking 700 assert_file_has_mode ${newetc}/a/long/dir 777 echo "ok" + +# Add /etc/initially-empty +cd "${test_tmpdir}/osdata" +mkdir -p usr/etc/initially-empty +ostree --repo=${test_tmpdir}/testos-repo commit -b testos/buildmaster/x86_64-runtime -s "Add empty directory" +cd ${test_tmpdir} + +# Upgrade, check that we have it +ostree admin --sysroot=sysroot upgrade --os=testos +rev=$(ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) +assert_has_dir sysroot/ostree/deploy/testos/deploy/$rev.0/etc/initially-empty + +# Now add a two files in initially-empty +cd "${test_tmpdir}/osdata" +touch usr/etc/initially-empty/{afile,bfile} +ostree --repo=${test_tmpdir}/testos-repo commit -b testos/buildmaster/x86_64-runtime -s "Add empty directory" + +# Upgrade, check that we have the two new files +cd ${test_tmpdir} +ostree admin --sysroot=sysroot upgrade --os=testos +rev=$(ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) +assert_has_file sysroot/ostree/deploy/testos/deploy/$rev.0/etc/initially-empty/afile +assert_has_file sysroot/ostree/deploy/testos/deploy/$rev.0/etc/initially-empty/bfile + +echo "ok" |