95c1ed3695
This way when debugging if I want to preserve the state so I can go there and rerun command under gdb for exmaple, all I need to do is set `env TEST_SKIP_CLEANUP=1` rather than also needing to find a separate dir and also set `env RPMOSTREE_PRESERVE_TMPDIR=1`. Closes: #1630 Approved by: jlebon
46 lines
1.5 KiB
Bash
Executable File
46 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -xeuo pipefail
|
|
|
|
dn=$(cd $(dirname $0) && pwd)
|
|
. ${dn}/libcomposetest.sh
|
|
|
|
# Test that `units` and `machineid-compat: False` conflict
|
|
prepare_compose_test "machineid-compat-conflict"
|
|
pysetjsonmember "machineid-compat" 'False'
|
|
pysetjsonmember "units" '["tuned.service"]'
|
|
|
|
# Do the compose -- we call compose directly because `set -e` has no effect when
|
|
# calling functions within an if condition context
|
|
rm ${compose_workdir} -rf
|
|
mkdir ${test_tmpdir}/workdir
|
|
if rpm-ostree compose tree ${compose_base_argv} ${treefile} |& tee err.txt; then
|
|
assert_not_reached err.txt "Successfully composed with units and machineid-compat=False?"
|
|
fi
|
|
assert_file_has_content_literal err.txt \
|
|
"'units' directive is incompatible with machineid-compat = false"
|
|
echo "ok conflict with units"
|
|
|
|
# In this test we also want to test that include:
|
|
# correctly handles machineid-compat.
|
|
prepare_compose_test "machineid-compat"
|
|
# Also test having no ref
|
|
pyeditjson 'del jd["ref"]' < ${treefile} > ${treefile}.new
|
|
mv ${treefile}{.new,}
|
|
treeref=""
|
|
pysetjsonmember "machineid-compat" 'False'
|
|
cat > composedata/fedora-machineid-compat-includer.yaml <<EOF
|
|
include: fedora-machineid-compat.json
|
|
EOF
|
|
export treefile=composedata/fedora-machineid-compat-includer.yaml
|
|
runcompose
|
|
echo "ok compose"
|
|
|
|
ostree --repo="${repobuild}" refs >refs.txt
|
|
diff -u /dev/null refs.txt
|
|
echo "ok no refs written"
|
|
|
|
ostree --repo=${repobuild} ls ${commit} /usr/etc > ls.txt
|
|
assert_not_file_has_content ls.txt 'machine-id'
|
|
echo "ok machineid-compat"
|