From 2e744a2cd89fc0ea67cf78cfba617b5105a26215 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Sun, 24 Jan 2021 01:34:23 -0800 Subject: [PATCH] oom: update extended test to remove swap gating --- test/units/testsuite-56.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/units/testsuite-56.sh b/test/units/testsuite-56.sh index 6e7941a57fc..4dc9d8c7a86 100755 --- a/test/units/testsuite-56.sh +++ b/test/units/testsuite-56.sh @@ -6,7 +6,6 @@ systemd-analyze log-level debug systemd-analyze log-target console # Loose checks to ensure the environment has the necessary features for systemd-oomd -[[ "$( awk '/SwapTotal/ { print $2 }' /proc/meminfo )" != "0" ]] || echo "no swap" >> /skipped [[ -e /proc/pressure ]] || echo "no PSI" >> /skipped cgroup_type=$(stat -fc %T /sys/fs/cgroup/) if [[ "$cgroup_type" != *"cgroup2"* ]] && [[ "$cgroup_type" != *"0x63677270"* ]]; then @@ -16,8 +15,8 @@ fi echo "DefaultMemoryPressureDurationSec=5s" >> /etc/systemd/oomd.conf -systemctl start testsuite-56-testbloat.service systemctl start testsuite-56-testchill.service +systemctl start testsuite-56-testbloat.service # Verify systemd-oomd is monitoring the expected units oomctl | grep "/testsuite-56-workload.slice" -- 2.47.3