keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compose-tests: add more mutate-os-release cases

Browse Source 
Check that the logic added in the previous commit is respected.

Closes: #603
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-02-01 12:16:09 -05:00 committed by Atomic Bot
parent c756b26521
commit 4f0be52dca
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/compose-tests/libcomposetest.sh
View File

@ -34,7 +34,7 @@ prepare_compose_test() {
}
runcompose() {
rpm-ostree compose --repo=${repobuild} tree --cache-only --cachedir=${test_compose_datadir}/cache ${treefile}
rpm-ostree compose --repo=${repobuild} tree --cache-only --cachedir=${test_compose_datadir}/cache ${treefile} "$@"
ostree --repo=${repo} pull-local ${repobuild}
}

44
tests/compose-tests/test-mutate-os-release.sh
View File

@ -5,11 +5,48 @@ set -xeuo pipefail
dn=$(cd $(dirname $0) && pwd)
. ${dn}/libcomposetest.sh
prepare_compose_test "mutate-os-release"
# specifying the key but neither automatic_version_prefix nor
# --add-metadata-string should cause no mutation
prepare_compose_test "mutate-os-release-none"
pysetjsonmember "mutate-os-release" '"25"'
runcompose
echo "ok compose (none)"
ostree --repo=${repobuild} cat ${treeref} \
/usr/lib/os.release.d/os-release-fedora > os-release.prop
assert_file_has_content os-release.prop VERSION_ID=25
assert_not_file_has_content os-release.prop OSTREE_VERSION=
assert_file_has_content os-release.prop 'VERSION="25 (Twenty Five)"'
echo "ok mutate-os-release-none"
# make sure --add-metadata-string has precedence and works with
# mutate-os-release
prepare_compose_test "mutate-os-release-cli"
pysetjsonmember "automatic_version_prefix" '"25.555"'
pysetjsonmember "mutate-os-release" '"25"'
runcompose --add-metadata-string=version=25.444
echo "ok compose (cli)"
ostree --repo=${repobuild} cat ${treeref} \
/usr/lib/os.release.d/os-release-fedora > os-release.prop
# VERSION_ID *shouldn't* change
# (https://github.com/projectatomic/rpm-ostree/pull/433)
assert_file_has_content os-release.prop VERSION_ID=25
assert_file_has_content os-release.prop OSTREE_VERSION=25.444
assert_file_has_content os-release.prop 'VERSION="25\.444 (Twenty Five)"'
echo "ok mutate-os-release-cli"
# make sure automatic_version_prefix works
prepare_compose_test "mutate-os-release-auto"
pysetjsonmember "automatic_version_prefix" '"25.555"'
pysetjsonmember "mutate-os-release" '"25"'
runcompose
echo "ok compose"
echo "ok compose (auto)"
ostree --repo=${repobuild} cat ${treeref} \
/usr/lib/os.release.d/os-release-fedora > os-release.prop
@ -19,5 +56,4 @@ ostree --repo=${repobuild} cat ${treeref} \
assert_file_has_content os-release.prop VERSION_ID=25
assert_file_has_content os-release.prop OSTREE_VERSION=25.555
assert_file_has_content os-release.prop 'VERSION="25\.555 (Twenty Five)"'
echo "ok mutate-os-release"
echo "ok mutate-os-release (auto)"