forked from pool/systemd
94f1d69402
See https://github.com/openSUSE/systemd/blob/SUSE/v255/NEWS for details. - This includes the following bug fixes: - commit 6e10405aa25fe5e76b740d9ec59730e3f4470c7a (bsc#1219766) - The following patches have been rebased: - 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch - 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch - 0009-pid1-handle-console-specificities-weirdness-for-s390.patch - 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch - 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch - The following patches have been removed since they're part of v255: - 5003-cgroup-rename-TasksMax-structure-to-CGroupTasksMax.patch - 5004-bus-print-properties-ignore-CGROUP_LIMIT_MAX-for-Mem.patch - 5005-bus-print-properties-prettify-more-unset-properties.patch - systemd-boot has been added to the list of the dependencies of the systemd-testsuite package as the installation of the bootloader is now tested. - the following patches have been backported on top of v255.3: 96edf7ad18 service: Demote log level of NotifyAccess= messages to debug (bsc#1210113 jsc#PED-6214) fdde7f26d6 vconsole-setup: don't fail if the only found vc is already used by plymouth (bsc#1218618) f96c587d41 rules: set up tty permissions and group for /dev/hvc* nodes (bsc#1218137) 63a41b8899 vconsole-setup: remember the correct error value when open_terminal() fails f51a2e038c vconsole-setup: handle the case where the vc is in KD_GRAPHICS mode more gracefully (bsc#1215282) 15025a04c4 test: make sure to install the filesystem package in the test image on SUSE 06fecfb635 test: make sure that sd-boot is installed before testing bootctl 1e8788ea68 test: install systemd-boot in openSUSE test images 6e2875ad43 test/test-shutdown.py: optionally display the test I/Os in a dedicated log file 4be1a801b4 test-69: send SIGTERM to ask systemd-nspawn to properly stop the container 7bdab7b7c7 man: Document ranges for distributions config files and local config files 3f12a6c22f test: systemd-update-utmp is optional OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1497
98 lines
2.9 KiB
Diff
98 lines
2.9 KiB
Diff
From 207784eeaab0c274dc087056f20523d7c10939fe Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com>
|
|
Date: Wed, 9 Aug 2023 22:42:36 +0200
|
|
Subject: [PATCH 5007/5010] test: Convert rlimit test to subtest of generic
|
|
limit testing
|
|
|
|
No functional change intended. Preparation for new tests.
|
|
|
|
(cherry picked from commit 834ca54624ae1d61ec4fcf3a63b10271c38c4860)
|
|
|
|
[mkoutny: fixes jsc#PED-5659]
|
|
---
|
|
test/units/testsuite-05.rlimit.sh | 25 +++++++++++++++++++++++++
|
|
test/units/testsuite-05.service | 2 +-
|
|
test/units/testsuite-05.sh | 22 +++-------------------
|
|
3 files changed, 29 insertions(+), 20 deletions(-)
|
|
create mode 100755 test/units/testsuite-05.rlimit.sh
|
|
|
|
diff --git a/test/units/testsuite-05.rlimit.sh b/test/units/testsuite-05.rlimit.sh
|
|
new file mode 100755
|
|
index 0000000000..bbf3adbe65
|
|
--- /dev/null
|
|
+++ b/test/units/testsuite-05.rlimit.sh
|
|
@@ -0,0 +1,25 @@
|
|
+#!/usr/bin/env bash
|
|
+# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
+set -eux
|
|
+set -o pipefail
|
|
+
|
|
+P=/run/systemd/system.conf.d
|
|
+mkdir $P
|
|
+
|
|
+cat >$P/rlimits.conf <<EOF
|
|
+[Manager]
|
|
+DefaultLimitNOFILE=10000:16384
|
|
+EOF
|
|
+
|
|
+systemctl daemon-reload
|
|
+
|
|
+[[ "$(systemctl show -P DefaultLimitNOFILESoft)" = "10000" ]]
|
|
+[[ "$(systemctl show -P DefaultLimitNOFILE)" = "16384" ]]
|
|
+
|
|
+[[ "$(systemctl show -P LimitNOFILESoft testsuite-05.service)" = "10000" ]]
|
|
+[[ "$(systemctl show -P LimitNOFILE testsuite-05.service)" = "16384" ]]
|
|
+
|
|
+# shellcheck disable=SC2016
|
|
+systemd-run --wait -t bash -c '[[ "$(ulimit -n -S)" = "10000" ]]'
|
|
+# shellcheck disable=SC2016
|
|
+systemd-run --wait -t bash -c '[[ "$(ulimit -n -H)" = "16384" ]]'
|
|
diff --git a/test/units/testsuite-05.service b/test/units/testsuite-05.service
|
|
index ab72d8fe27..cf32accb8c 100644
|
|
--- a/test/units/testsuite-05.service
|
|
+++ b/test/units/testsuite-05.service
|
|
@@ -1,6 +1,6 @@
|
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
[Unit]
|
|
-Description=TEST-05-RLIMITS
|
|
+Description=TEST-05-LIMITS
|
|
|
|
[Service]
|
|
ExecStartPre=rm -f /failed /testok
|
|
diff --git a/test/units/testsuite-05.sh b/test/units/testsuite-05.sh
|
|
index 870845d14b..9c2a033aa9 100755
|
|
--- a/test/units/testsuite-05.sh
|
|
+++ b/test/units/testsuite-05.sh
|
|
@@ -3,25 +3,9 @@
|
|
set -eux
|
|
set -o pipefail
|
|
|
|
-P=/run/systemd/system.conf.d
|
|
-mkdir $P
|
|
+# shellcheck source=test/units/test-control.sh
|
|
+. "$(dirname "$0")"/test-control.sh
|
|
|
|
-cat >$P/rlimits.conf <<EOF
|
|
-[Manager]
|
|
-DefaultLimitNOFILE=10000:16384
|
|
-EOF
|
|
-
|
|
-systemctl daemon-reload
|
|
-
|
|
-[[ "$(systemctl show -P DefaultLimitNOFILESoft)" = "10000" ]]
|
|
-[[ "$(systemctl show -P DefaultLimitNOFILE)" = "16384" ]]
|
|
-
|
|
-[[ "$(systemctl show -P LimitNOFILESoft testsuite-05.service)" = "10000" ]]
|
|
-[[ "$(systemctl show -P LimitNOFILE testsuite-05.service)" = "16384" ]]
|
|
-
|
|
-# shellcheck disable=SC2016
|
|
-systemd-run --wait -t bash -c '[[ "$(ulimit -n -S)" = "10000" ]]'
|
|
-# shellcheck disable=SC2016
|
|
-systemd-run --wait -t bash -c '[[ "$(ulimit -n -H)" = "16384" ]]'
|
|
+run_subtests
|
|
|
|
touch /testok
|
|
--
|
|
2.35.3
|
|
|