tests: Hard require jq

I don't see a reason not to require more stuff to execute tests,
and having it be optional reduces our coverage unnecessarily.

Closes: #580
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-01-17 09:12:26 -05:00 committed by Atomic Bot
parent 30bed29230
commit f02130b19e
2 changed files with 8 additions and 4 deletions

View File

@ -49,10 +49,8 @@ echo "ok status shows right version"
rpm-ostree status --json > status.json
json-glib-format status.json
if test -x /usr/bin/jq; then
jq '.deployments[0].version' < status.json > version.txt
assert_file_has_content version.txt '1\.0\.10'
fi
jq '.deployments[0].version' < status.json > version.txt
assert_file_has_content version.txt '1\.0\.10'
os_repository_new_commit
rpm-ostree upgrade --os=testos

View File

@ -27,6 +27,12 @@ LIBTEST_SH=1
self="$(realpath $0)"
for bin in jq; do
if ! command -v $bin >/dev/null; then
(echo ${bin} is required to execute tests 1>&2; exit 1)
fi
done
if test -z "${SRCDIR:-}"; then
SRCDIR=${topsrcdir}/tests
fi