test: move TEST-25-IMPORT setup to static files
Also run mask_supporting_services() here.
This commit is contained in:
parent
f4c40fd754
commit
6e796683df
|
@ -12,22 +12,9 @@ test_setup() {
|
||||||
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
||||||
|
|
||||||
setup_basic_environment
|
setup_basic_environment
|
||||||
dracut_install dd gunzip mv tar diff
|
mask_supporting_services
|
||||||
|
|
||||||
# setup the testsuite service
|
|
||||||
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
|
||||||
[Unit]
|
|
||||||
Description=Testsuite service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/testsuite.sh
|
|
||||||
Type=oneshot
|
|
||||||
EOF
|
|
||||||
cp testsuite.sh $initdir/
|
|
||||||
|
|
||||||
setup_testsuite
|
|
||||||
)
|
)
|
||||||
setup_nspawn_root
|
setup_nspawn_root
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@" 25
|
||||||
|
|
|
@ -92,6 +92,7 @@ BASICTOOLS=(
|
||||||
sulogin
|
sulogin
|
||||||
sysctl
|
sysctl
|
||||||
tail
|
tail
|
||||||
|
tar
|
||||||
tee
|
tee
|
||||||
test
|
test
|
||||||
touch
|
touch
|
||||||
|
|
6
test/units/testsuite-25.service
Normal file
6
test/units/testsuite-25.service
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
[Unit]
|
||||||
|
Description=TEST-25-IMPORT
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
|
||||||
|
Type=oneshot
|
Loading…
Reference in a new issue