shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

test: move TEST-05-RLIMITS setup to static files

Browse Source 
The test currently fails in the check for LimitNOFILESoft/LimitNOFILE. I see
default values there. This doesn't seem to be related to the changes in the
test suite, but rather to the recent changes to pid1.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-12-10 14:09:59 +01:00
parent 9901a6ad2e
commit ed024e1d98
4 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/TEST-05-RLIMITS/test-rlimits.sh
View File

@ -1,15 +0,0 @@
#!/usr/bin/env bash
set -x
set -e
set -o pipefail
[[ "$(systemctl show -p DefaultLimitNOFILESoft)" = "DefaultLimitNOFILESoft=10000" ]]
[[ "$(systemctl show -p DefaultLimitNOFILE)" = "DefaultLimitNOFILE=16384" ]]
[[ "$(systemctl show -p LimitNOFILESoft testsuite.service)" = "LimitNOFILESoft=10000" ]]
[[ "$(systemctl show -p LimitNOFILE testsuite.service)" = "LimitNOFILE=16384" ]]
[[ "$(ulimit -n -S)" = "10000" ]]
[[ "$(ulimit -n -H)" = "16384" ]]
touch /testok

21
test/TEST-05-RLIMITS/test.sh
View File

@ -14,27 +14,8 @@ test_setup() {
setup_basic_environment
mask_supporting_services
cat >$initdir/etc/systemd/system.conf <<EOF
[Manager]
DefaultLimitNOFILE=10000:16384
EOF
# setup the testsuite service
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
[Unit]
Description=Testsuite service
[Service]
ExecStart=/test-rlimits.sh
Type=oneshot
EOF
cp test-rlimits.sh $initdir/
setup_testsuite
)
setup_nspawn_root
}
do_test "$@"
do_test "$@" 05

6
test/units/testsuite-05.service Normal file
View File

@ -0,0 +1,6 @@
[Unit]
Description=TEST-05-RLIMITS
[Service]
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot

25
test/units/testsuite-05.sh Executable file
View File

@ -0,0 +1,25 @@
#!/usr/bin/env bash
set -x
set -e
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 --value -p DefaultLimitNOFILESoft)" = "10000" ]]
[[ "$(systemctl show --value -p DefaultLimitNOFILE)" = "16384" ]]
[[ "$(systemctl show --value -p LimitNOFILESoft testsuite-05.service)" = "10000" ]]
[[ "$(systemctl show --value -p LimitNOFILE testsuite-05.service)" = "16384" ]]
systemd-run --wait -t bash -c '[[ "$(ulimit -n -S)" = "10000" ]]'
systemd-run --wait -t bash -c '[[ "$(ulimit -n -H)" = "16384" ]]'
touch /testok