diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-24 16:23:39 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-24 16:23:39 +0200 |
| commit | 7cad32bbdeed20ac0daf6049ab093db902f4a4e7 (patch) | |
| tree | 44fffa4c1d97541b33463e6c27929860bd09ea94 /test/TEST-07-ISSUE-1981 | |
| parent | b2ecd099dc7371aafb988145ab40a631f7050d41 (diff) | |
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.
Diffstat (limited to 'test/TEST-07-ISSUE-1981')
| -rwxr-xr-x | test/TEST-07-ISSUE-1981/test.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh index d97c4ec27d..2f7f01058e 100755 --- a/test/TEST-07-ISSUE-1981/test.sh +++ b/test/TEST-07-ISSUE-1981/test.sh @@ -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" |