diff options
author | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-08-04 14:34:14 +0200 |
---|---|---|
committer | Evgeny Vereshchagin <evvers@ya.ru> | 2017-08-04 15:34:14 +0300 |
commit | 054ee249a28194626115a23257870f257bf69fda (patch) | |
tree | 309bf895976f355f02e89277d8c91b0d2028248f /test/TEST-15-DROPIN | |
parent | a93e2f65eb75389b10896f44c93365cefa775d9b (diff) | |
download | systemd-054ee249a28194626115a23257870f257bf69fda.tar.gz |
test: Factorize common integration test functions (#6540)
All test/TEST* but TEST-02-CRYPTSETUP share the same check_result_qemu()
and test_cleanup(), so move them into test_functions and only override
them in TEST-02-CRYPTSETUP.
Also provide a common test_run() which by default assumes that both QEMU
and nspawn tests are run. Particular tests which don't support either
need to explicitly opt out by setting $TEST_NO_{QEMU,NSPAWN}. Do it this
way around to avoid accidentally forgetting to opt in, and to encourage
test authors to at least always support nspawn.
Diffstat (limited to 'test/TEST-15-DROPIN')
-rwxr-xr-x | test/TEST-15-DROPIN/test.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/test/TEST-15-DROPIN/test.sh b/test/TEST-15-DROPIN/test.sh index 1b460db7b1..536b379f64 100755 --- a/test/TEST-15-DROPIN/test.sh +++ b/test/TEST-15-DROPIN/test.sh @@ -3,22 +3,10 @@ # ex: ts=8 sw=4 sts=4 et filetype=sh TEST_DESCRIPTION="Dropin tests" +TEST_NO_QEMU=1 . $TEST_BASE_DIR/test-functions - -test_run_nspawn() { - if ! run_nspawn; then - dwarn "can't run systemd-nspawn, skipping" - return 0 - fi - check_result_nspawn -} - -test_run() { - test_run_nspawn || return -} - test_setup() { # create the basic filesystem layout setup_basic_environment >/dev/null |