summaryrefslogtreecommitdiff
path: root/test/TEST-12-ISSUE-3171
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-06-24 12:07:18 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2016-06-24 12:07:18 +0200
commit633736bbf49e31d62e7a8a16b330efa6866723db (patch)
tree28a6d707f616c9e8436943f067564a7afa3cfbfb /test/TEST-12-ISSUE-3171
parenteaa03c05f72b20610fc7c3b0e943d032fa78f0d1 (diff)
tests: make TEST-12-ISSUE-3171 nspawn invocation consistent with other tests
The result of check_nspawn does not mean much, and this forgot to ask check_nspawn() whether nspawn can be used at all. This brings TEST-12-ISSUE-3171 in line with other nspawn tests.
Diffstat (limited to 'test/TEST-12-ISSUE-3171')
-rwxr-xr-xtest/TEST-12-ISSUE-3171/test.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
index 925dcad9ea..d0e934898c 100755
--- a/test/TEST-12-ISSUE-3171/test.sh
+++ b/test/TEST-12-ISSUE-3171/test.sh
@@ -6,8 +6,12 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3171"
. $TEST_BASE_DIR/test-functions
test_run() {
- run_nspawn || return 1
- check_result_nspawn || return 1
+ if check_nspawn; then
+ run_nspawn
+ check_result_nspawn || return 1
+ else
+ dwarn "can't run systemd-nspawn, skipping"
+ fi
return 0
}