tests: replace the few remaining Type=simple with Type=exec

Except for the places where we explicitly want to test Type=simple,
we should use Type=exec.

diff --git a/test/testsuite-04.units/forever-print-hola.service b/test/testsuite-04.units/forever-print-hola.service
index a0dc095688685cb44f2452b9228b151d1389af59..278145285c1caa703e31947e06322ffa469ca70a 100644 (file)
--- a/test/testsuite-04.units/forever-print-hola.service
+++ b/test/testsuite-04.units/forever-print-hola.service
@@ -2,5 +2,5 @@
 Description=ForeverPrintHola service
 
 [Service]
-Type=simple
+Type=exec
 ExecStart=sh -x -c 'while :; do printf "Hola\n" || touch /i-lose-my-logs; sleep 1; done'

diff --git a/test/testsuite-11.units/fail-on-restart.service b/test/testsuite-11.units/fail-on-restart.service
index 9264f151f31b9d1849eddd318bbc5d1e3a4630f6..6832cb241c4eb283c30ea9bfe290783cc5bcb8df 100644 (file)
--- a/test/testsuite-11.units/fail-on-restart.service
+++ b/test/testsuite-11.units/fail-on-restart.service
@@ -4,6 +4,6 @@ StartLimitIntervalSec=1m
 StartLimitBurst=3
 
 [Service]
-Type=simple
+Type=exec
 ExecStart=false
 Restart=always

diff --git a/test/units/testsuite-16.service b/test/units/testsuite-16.service
index b44baad91a650134b8b5a825c8fdf900d55d8792..34e89ff7527af75af70cc45fa250582b534284bb 100644 (file)
--- a/test/units/testsuite-16.service
+++ b/test/units/testsuite-16.service
@@ -13,7 +13,7 @@ StopWhenUnneeded=yes
 
 [Service]
 ExecStartPre=rm -f /failed /testok
-Type=simple
+Type=exec
 TimeoutStartSec=infinity
 ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh
 ExecStart=true