From 28c48f4d78d5c7c8ba0a6a679b09f263387e1831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 14 Sep 2020 09:02:36 +0200 Subject: [PATCH] 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. --- test/testsuite-04.units/forever-print-hola.service | 2 +- test/testsuite-11.units/fail-on-restart.service | 2 +- test/units/testsuite-16.service | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testsuite-04.units/forever-print-hola.service b/test/testsuite-04.units/forever-print-hola.service index a0dc095688..278145285c 100644 --- 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 9264f151f3..6832cb241c 100644 --- 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 b44baad91a..34e89ff752 100644 --- 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