From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 24 Jun 2016 10:07:18 +0000 (+0200)
Subject: tests: make TEST-12-ISSUE-3171 nspawn invocation consistent with other tests
X-Git-Tag: v231~119^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=633736bbf49e31d62e7a8a16b330efa6866723db;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
index 925dcad9ea0..d0e934898c6 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
 }