picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/TEST-01-BASIC/test.sh
View File

@ -25,8 +25,7 @@ test_run() {
else
dwarn "can't run QEMU, skipping"
fi
if check_nspawn; then
run_nspawn
if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"

3
test/TEST-03-JOBS/test.sh
View File

@ -25,8 +25,7 @@ test_run() {
else
dwarn "can't run QEMU, skipping"
fi
if check_nspawn; then
run_nspawn
if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"

3
test/TEST-04-JOURNAL/test.sh
View File

@ -25,8 +25,7 @@ test_run() {
else
dwarn "can't run QEMU, skipping"
fi
if check_nspawn; then
run_nspawn
if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"

3
test/TEST-05-RLIMITS/test.sh
View File

@ -25,8 +25,7 @@ test_run() {
else
dwarn "can't run QEMU, skipping"
fi
if check_nspawn; then
run_nspawn
if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"

6
test/TEST-07-ISSUE-1981/test.sh
View File

@ -5,11 +5,11 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/1981"
. $TEST_BASE_DIR/test-functions
NSPAWN_TIMEOUT=30s
test_run() {
dwarn "skipping QEMU"
if check_nspawn; then
NSPAWN_TIMEOUT=30s
run_nspawn
if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"

3
test/TEST-12-ISSUE-3171/test.sh
View File

@ -6,8 +6,7 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3171"
. $TEST_BASE_DIR/test-functions
test_run() {
if check_nspawn; then
run_nspawn
if run_nspawn; then
check_result_nspawn || return 1
else
dwarn "can't run systemd-nspawn, skipping"

9
test/test-functions
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