diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-11-22 18:42:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 18:42:51 +0100 |
| commit | 31897753fb0cc508bafb5de1987354053d3c4d2d (patch) | |
| tree | 4bdd69303e0d84bb6e35b5731c398bde57c28f18 /test | |
| parent | fs-util: add comment explaining what xopenat() is for (diff) | |
| parent | core: serialize and deserialize trigger ratelimits for socket and path (diff) | |
| download | systemd-31897753fb0cc508bafb5de1987354053d3c4d2d.tar.xz systemd-31897753fb0cc508bafb5de1987354053d3c4d2d.zip | |
Merge pull request #30024 from keszybz/one-doc-thingy
Serialize units ratelimits and document StartLimitIntervalSec=infinity
Diffstat (limited to 'test')
| -rwxr-xr-x | test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh | 4 | ||||
| -rwxr-xr-x | test/units/testsuite-67.sh | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh b/test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh index 8fdf1b132e..96d096d9ad 100755 --- a/test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh +++ b/test/units/testsuite-04.SYSTEMD_JOURNAL_COMPRESS.sh @@ -7,6 +7,9 @@ set -o pipefail mkdir /run/systemd/system/systemd-journald.service.d MACHINE_ID="$(</etc/machine-id)" +# Reset the start-limit counters, as we're going to restart journald a couple of times +systemctl reset-failed systemd-journald.service + for c in NONE XZ LZ4 ZSTD; do cat >/run/systemd/system/systemd-journald.service.d/compress.conf <<EOF [Service] @@ -35,4 +38,5 @@ done rm /run/systemd/system/systemd-journald.service.d/compress.conf systemctl daemon-reload systemctl restart systemd-journald.service +systemctl reset-failed systemd-journald.service journalctl --rotate diff --git a/test/units/testsuite-67.sh b/test/units/testsuite-67.sh index ca1cbe479f..a42fd66aa5 100755 --- a/test/units/testsuite-67.sh +++ b/test/units/testsuite-67.sh @@ -88,6 +88,8 @@ do # Make sure we are in a consistent state, e.g. not already active before we start systemctl stop systemd-integritysetup@"${DM_NAME}".service || exit 1 systemctl start systemd-integritysetup@"${DM_NAME}".service || exit 1 + # Reset the start-limit counters, as we're going to restart the service a couple of times + systemctl reset-failed systemd-integritysetup@"${DM_NAME}".service # Check the signature on the FS to ensure we can retrieve it and that is matches if [ -e "${FULL_DM_DEV_NAME}" ]; then |