diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-06-24 19:44:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 19:44:18 +0300 |
| commit | d946fb596f7ed010dce6685a499e0aebef00e451 (patch) | |
| tree | fcf9d56b1f966f421e639c63b41c3edc3c657817 /test/TEST-07-ISSUE-1981/test.sh | |
| parent | 6edefe0b064e57af108f56172b3dafa0be61e234 (diff) | |
| parent | 7cad32bbdeed20ac0daf6049ab093db902f4a4e7 (diff) | |
Merge pull request #3587 from martinpitt/master
Fix some test issues
Diffstat (limited to 'test/TEST-07-ISSUE-1981/test.sh')
| -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" |