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

vmcheck/misc-1: skip the overlay check when needed

Browse Source 
It's possible to run the `vmcheck` tests against an existing host that
has `rpm-ostree` already present.  We don't overlay the built binaries
in this situation, so we should not check for the presence of the
overlay in the commit meta.

Closes: #1555
Approved by: cgwalters
This commit is contained in:
Micah Abbott 2018-09-11 16:19:37 -04:00 committed by Atomic Bot
parent 807f21788e
commit bce966a981
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/vmcheck/test-misc-1.sh
View File

@ -48,10 +48,15 @@ vm_assert_status_jq \
'.deployments[0]["requested-local-packages"]' \ '.deployments[0]["requested-local-packages"]' \
'.deployments[0]["base-removals"]' \ '.deployments[0]["base-removals"]' \
'.deployments[0]["requested-base-removals"]' \ '.deployments[0]["requested-base-removals"]' \
'.deployments[0]["base-commit-meta"]["ostree.source-title"]|contains("overlay")' \
'.deployments[0]["layered-commit-meta"]|not' '.deployments[0]["layered-commit-meta"]|not'
echo "ok empty pkg arrays, and commit meta correct in status json" echo "ok empty pkg arrays, and commit meta correct in status json"
if test -z "${RPMOSTREE_TEST_NO_OVERLAY:-}"; then
vm_assert_status_jq \
'.deployments[0]["base-commit-meta"]["ostree.source-title"]|contains("overlay")'
echo "ok overlay found in commit meta"
fi
vm_rpmostree status --jsonpath '$.deployments[0].booted' > jsonpath.txt vm_rpmostree status --jsonpath '$.deployments[0].booted' > jsonpath.txt
assert_file_has_content_literal jsonpath.txt '[true]' assert_file_has_content_literal jsonpath.txt '[true]'
echo "ok jsonpath" echo "ok jsonpath"