diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-17 19:39:29 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-17 19:39:29 +0100 |
| commit | 40f41f34d4af15d0147b5b2525f0b87ff62eae9a (patch) | |
| tree | d4f998414eb62586a59534e875b5fb85f210d116 /test/units | |
| parent | 415d7d774ab8bb46fae18dbb8aa4a69e0ad88b57 (diff) | |
| download | systemd-40f41f34d4af15d0147b5b2525f0b87ff62eae9a.tar.gz | |
Revert "core: Propagate condition failed state to triggering units."
This reverts commit 12ab94a1e4961a39c32efb60b71866ab588d3ea2.
Diffstat (limited to 'test/units')
| -rw-r--r-- | test/units/testsuite-10.service | 2 | ||||
| -rw-r--r-- | test/units/testsuite-63.service | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/units/testsuite-10.service b/test/units/testsuite-10.service index f33c1b646a..9fcfd673c6 100644 --- a/test/units/testsuite-10.service +++ b/test/units/testsuite-10.service @@ -12,5 +12,5 @@ ExecStart=-nc -w20 -U /run/test.ctl # systemd enough time even on slower machines, to reach the trigger limit. ExecStart=sleep 10 ExecStart=sh -x -c 'test "$(systemctl show test10.socket -P ActiveState)" = failed' -ExecStart=sh -x -c 'test "$(systemctl show test10.socket -P Result)" = service-condition-failed' +ExecStart=sh -x -c 'test "$(systemctl show test10.socket -P Result)" = trigger-limit-hit' ExecStart=sh -x -c 'echo OK >/testok' diff --git a/test/units/testsuite-63.service b/test/units/testsuite-63.service index 616d8a6acc..0a8d143be9 100644 --- a/test/units/testsuite-63.service +++ b/test/units/testsuite-63.service @@ -8,10 +8,10 @@ Type=oneshot ExecStart=rm -f /tmp/nonexistent ExecStart=systemctl start test63.path ExecStart=touch /tmp/test63 +# Make sure systemd has sufficient time to hit the start limit for test63.service. ExecStart=sleep 2 -# Ensure both the service and the corresponding path unit go inactive due to the failed condition check. -ExecStart=sh -x -c 'test "$(systemctl show test63.service -P ActiveState)" = inactive' -ExecStart=sh -x -c 'test "$(systemctl show test63.service -P Result)" = success' +ExecStart=sh -x -c 'test "$(systemctl show test63.service -P ActiveState)" = failed' +ExecStart=sh -x -c 'test "$(systemctl show test63.service -P Result)" = start-limit-hit' ExecStart=sh -x -c 'test "$(systemctl show test63.path -P ActiveState)" = failed' -ExecStart=sh -x -c 'test "$(systemctl show test63.path -P Result)" = unit-condition-failed' +ExecStart=sh -x -c 'test "$(systemctl show test63.path -P Result)" = unit-start-limit-hit' ExecStart=sh -x -c 'echo OK >/testok' |