test: move TEST-41-ONESHOT-RESTART setup to static files

2019-12-10 10:09:53 +01:00 · 2019-12-10 10:09:53 +01:00 · 2b2eefee06
parent d48b27bffd
commit 2b2eefee06
3 changed files with 7 additions and 14 deletions
--- a/test/TEST-41-ONESHOT-RESTART/test.sh
+++ b/test/TEST-41-ONESHOT-RESTART/test.sh
@ -12,21 +12,8 @@ test_setup() {

        setup_basic_environment
        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
 }

-do_test "$@"
+do_test "$@" 41
--- a/test/units/testsuite-41.service
+++ b/test/units/testsuite-41.service
@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-41-ONESHOT-RESTART
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
--- a/test/TEST-41-ONESHOT-RESTART/testsuite.sh
+++ b/test/TEST-41-ONESHOT-RESTART/testsuite.sh