tests: add tests for compose+add files

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #253
Approved by: cgwalters
This commit is contained in:
Giuseppe Scrivano 2016-04-04 18:12:27 +02:00 committed by Colin Walters (automation)
parent 91ba02924f
commit 9f29b24805
3 changed files with 42 additions and 1 deletions

View File

@ -42,6 +42,7 @@ tests/test-ucontainer.sh: tests/compose/test-repo-local.repo
installed_test_data = tests/libtest.sh \ installed_test_data = tests/libtest.sh \
tests/compose/test-repo.repo \ tests/compose/test-repo.repo \
tests/compose/test-repo.json \ tests/compose/test-repo.json \
tests/compose/test-repo-add-files.json \
tests/compose/test-repo.repo.in \ tests/compose/test-repo.repo.in \
$(NULL) $(NULL)

View File

@ -0,0 +1,11 @@
{
"ref": "fedora/test",
"repos": ["test-repo"],
"selinux": false,
"packages": ["empty"],
"add-files": [["exported_file", "/exports/exported_file"]]
}

View File

@ -29,7 +29,7 @@ unset G_DEBUG
(arch | grep -q x86_64) || { echo 1>&2 "$0 can be run only on x86_64"; echo "1..0" ; exit 77; } (arch | grep -q x86_64) || { echo 1>&2 "$0 can be run only on x86_64"; echo "1..0" ; exit 77; }
echo "1..1" echo "1..4"
ostree init --repo=repo --mode=archive-z2 ostree init --repo=repo --mode=archive-z2
@ -47,3 +47,32 @@ ostree --repo=repo refs >refs.txt
assert_file_has_content refs.txt fedora/test assert_file_has_content refs.txt fedora/test
echo "ok compose" echo "ok compose"
# bring them in the current context so we can modify exported_file
ln -s $SRCDIR/test-repo-add-files.json .
ln -s $SRCDIR/test-repo.repo .
echo hello > exported_file
rpm-ostree --repo=repo compose tree --touch-if-changed=$(pwd)/touched test-repo-add-files.json
assert_has_file touched
old_mtime=$(stat -c %y touched)
ostree --repo=repo ls fedora/test /exports/exported_file | grep exported > exported.txt
assert_file_has_content exported.txt "/exports/exported_file"
assert_file_has_content exported.txt "0 0"
ostree --repo=repo rev-parse fedora/test > oldref.txt
rpm-ostree --repo=repo compose tree --touch-if-changed=$(pwd)/touched test-repo-add-files.json
new_mtime=$(stat -c %y touched)
ostree --repo=repo rev-parse fedora/test > newref.txt
assert_streq $(cat oldref.txt) $(cat newref.txt)
assert_streq "$old_mtime" "$new_mtime"
echo . >> exported_file
rpm-ostree --repo=repo compose tree --touch-if-changed=$(pwd)/touched test-repo-add-files.json
new_mtime=$(stat -c %y touched)
ostree --repo=repo rev-parse fedora/test > newref.txt
assert_not_streq $(cat oldref.txt) $(cat newref.txt)
assert_not_streq "$old_mtime" "$new_mtime"
echo "ok compose add files"