diff --git a/test/integration-tests/TEST-76-SYSCTL/meson.build b/test/integration-tests/TEST-76-SYSCTL/meson.build deleted file mode 100644 index 8dec5f37e7..0000000000 --- a/test/integration-tests/TEST-76-SYSCTL/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -integration_tests += [ - integration_test_template + { - 'name' : fs.name(meson.current_source_dir()), - }, -] diff --git a/test/integration-tests/meson.build b/test/integration-tests/meson.build index 5965f6646c..5d71e87c79 100644 --- a/test/integration-tests/meson.build +++ b/test/integration-tests/meson.build @@ -90,7 +90,6 @@ foreach dirname : [ 'TEST-73-LOCALE', 'TEST-74-AUX-UTILS', 'TEST-75-RESOLVED', - 'TEST-76-SYSCTL', 'TEST-78-SIGQUEUE', 'TEST-79-MEMPRESS', 'TEST-80-NOTIFYACCESS', diff --git a/test/units/TEST-76-SYSCTL.sh b/test/units/TEST-76-SYSCTL.sh deleted file mode 100755 index 04d89b8252..0000000000 --- a/test/units/TEST-76-SYSCTL.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: LGPL-2.1-or-later -set -eux -set -o pipefail - -# shellcheck source=test/units/util.sh -. "$(dirname "$0")"/util.sh - -export SYSTEMD_LOG_LEVEL=debug - -echo "foo.bar=42" >/tmp/foo.conf -assert_rc 0 /usr/lib/systemd/systemd-sysctl /tmp/foo.conf -assert_rc 1 /usr/lib/systemd/systemd-sysctl --strict /tmp/foo.conf - -echo "-foo.foo=42" >/tmp/foo.conf -assert_rc 0 /usr/lib/systemd/systemd-sysctl /tmp/foo.conf -assert_rc 0 /usr/lib/systemd/systemd-sysctl --strict /tmp/foo.conf - -if ! systemd-detect-virt --quiet --container; then - ip link add hoge type dummy - udevadm wait --timeout=30 /sys/class/net/hoge - - cat >/tmp/foo.conf </proc/sys/net/ipv4/conf/hoge/drop_gratuitous_arp - echo 0 >/proc/sys/net/ipv4/conf/hoge/bootp_relay - echo 0 >/proc/sys/net/ipv4/conf/hoge/disable_policy - - assert_rc 0 /usr/lib/systemd/systemd-sysctl --prefix=/net/ipv4/conf/hoge /tmp/foo.conf - assert_eq "$(cat /proc/sys/net/ipv4/conf/hoge/drop_gratuitous_arp)" "1" - assert_eq "$(cat /proc/sys/net/ipv4/conf/hoge/bootp_relay)" "1" - assert_eq "$(cat /proc/sys/net/ipv4/conf/hoge/disable_policy)" "0" -fi - -touch /testok diff --git a/test/units/TEST-87-AUX-UTILS-VM.sysctl.sh b/test/units/TEST-87-AUX-UTILS-VM.sysctl.sh new file mode 100755 index 0000000000..3bf1317327 --- /dev/null +++ b/test/units/TEST-87-AUX-UTILS-VM.sysctl.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later +set -eux +set -o pipefail + +# shellcheck source=test/units/util.sh +. "$(dirname "$0")"/util.sh + +export SYSTEMD_LOG_LEVEL=debug + +echo "foo.bar=42" >/tmp/foo.conf +assert_rc 0 /usr/lib/systemd/systemd-sysctl /tmp/foo.conf +assert_rc 1 /usr/lib/systemd/systemd-sysctl --strict /tmp/foo.conf + +echo "-foo.foo=42" >/tmp/foo.conf +assert_rc 0 /usr/lib/systemd/systemd-sysctl /tmp/foo.conf +assert_rc 0 /usr/lib/systemd/systemd-sysctl --strict /tmp/foo.conf + +ip link add hoge type dummy +trap 'ip link del hoge' EXIT +udevadm wait --timeout=30 /sys/class/net/hoge + +cat >/tmp/foo.conf </proc/sys/net/ipv4/conf/hoge/drop_gratuitous_arp +echo 0 >/proc/sys/net/ipv4/conf/hoge/bootp_relay +echo 0 >/proc/sys/net/ipv4/conf/hoge/disable_policy + +assert_rc 0 /usr/lib/systemd/systemd-sysctl --prefix=/net/ipv4/conf/hoge /tmp/foo.conf +assert_eq "$(cat /proc/sys/net/ipv4/conf/hoge/drop_gratuitous_arp)" "1" +assert_eq "$(cat /proc/sys/net/ipv4/conf/hoge/bootp_relay)" "1" +assert_eq "$(cat /proc/sys/net/ipv4/conf/hoge/disable_policy)" "0"