diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-10 11:49:39 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-28 11:46:48 +0100 |
| commit | bdfd515ad14913588be18b2bff8290842cec95d9 (patch) | |
| tree | 25583d79cf9947c65e0047e2046613b50487be52 /test | |
| parent | test/TEST-41: use a file in /tmp and reset the contents (diff) | |
| download | systemd-bdfd515ad14913588be18b2bff8290842cec95d9.tar.xz systemd-bdfd515ad14913588be18b2bff8290842cec95d9.zip | |
test: move TEST-42-EXECSTOPPOST setup to static files
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-42-EXECSTOPPOST/test.sh | 31 | ||||
| -rw-r--r-- | test/test-functions | 13 | ||||
| -rw-r--r-- | test/units/testsuite-42.service | 8 | ||||
| -rwxr-xr-x | test/units/testsuite-42.sh (renamed from test/TEST-42-EXECSTOPPOST/testsuite.sh) | 0 |
4 files changed, 22 insertions, 30 deletions
diff --git a/test/TEST-42-EXECSTOPPOST/test.sh b/test/TEST-42-EXECSTOPPOST/test.sh index 0c393597c7..e143fb6288 100755 --- a/test/TEST-42-EXECSTOPPOST/test.sh +++ b/test/TEST-42-EXECSTOPPOST/test.sh @@ -12,38 +12,9 @@ test_setup() { eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) setup_basic_environment - mask_supporting_services - - # setup policy for Type=dbus test - mkdir -p $initdir/etc/dbus-1/system.d - cat > $initdir/etc/dbus-1/system.d/systemd.test.ExecStopPost.conf <<EOF -<?xml version="1.0"?> -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy user="root"> - <allow own="systemd.test.ExecStopPost"/> - </policy> -</busconfig> -EOF - - # setup the testsuite service - cat >$initdir/etc/systemd/system/testsuite.service <<EOF -[Unit] -Description=Testsuite service -Before=getty-pre.target -Wants=getty-pre.target - -[Service] -ExecStart=/testsuite.sh -Type=oneshot -EOF - cp testsuite.sh $initdir/ - - setup_testsuite ) setup_nspawn_root } -do_test "$@" +do_test "$@" 42 diff --git a/test/test-functions b/test/test-functions index ca01a81d8e..eed3c3b9cd 100644 --- a/test/test-functions +++ b/test/test-functions @@ -909,6 +909,19 @@ install_dbus() { | while read file; do inst $file done + + # setup policy for Type=dbus test + mkdir -p $initdir/etc/dbus-1/system.d + cat > $initdir/etc/dbus-1/system.d/systemd.test.ExecStopPost.conf <<EOF +<?xml version="1.0"?> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy user="root"> + <allow own="systemd.test.ExecStopPost"/> + </policy> +</busconfig> +EOF } install_user_dbus() { diff --git a/test/units/testsuite-42.service b/test/units/testsuite-42.service new file mode 100644 index 0000000000..d5d102fd91 --- /dev/null +++ b/test/units/testsuite-42.service @@ -0,0 +1,8 @@ +[Unit] +Description=TEST-42-EXECSTOPPOST +Before=getty-pre.target +Wants=getty-pre.target + +[Service] +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +Type=oneshot diff --git a/test/TEST-42-EXECSTOPPOST/testsuite.sh b/test/units/testsuite-42.sh index 154398dd66..154398dd66 100755 --- a/test/TEST-42-EXECSTOPPOST/testsuite.sh +++ b/test/units/testsuite-42.sh |