test: merge check_nspawn() into run_nspawn()

This makes nspawn tests symmetric with run_qemu() which also exits with 1 if
QEMU is not available.
This commit is contained in:
Martin Pitt
2016-06-24 16:23:39 +02:00
parent b2ecd099dc
commit 7cad32bbde
7 changed files with 12 additions and 18 deletions
+4 -5
View File
@@ -108,7 +108,11 @@ $KERNEL_APPEND \
return 0
}
# Return 0 if nspawn did run (then you must check the result state/logs for actual
# success), or 1 if nspawn is not available.
run_nspawn() {
[[ -d /run/systemd/system ]] || return 1
local _nspawn_cmd="../../systemd-nspawn --register=no --kill-signal=SIGKILL --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND"
if [[ "$NSPAWN_TIMEOUT" != "infinity" ]]; then
_nspawn_cmd="timeout --foreground $NSPAWN_TIMEOUT $_nspawn_cmd"
@@ -1284,11 +1288,6 @@ inst_libdir_file() {
fi
}
check_nspawn() {
[[ -d /run/systemd/system ]]
}
do_test() {
if [[ $UID != "0" ]]; then
echo "TEST: $TEST_DESCRIPTION [SKIPPED]: not root" >&2