diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-06-09 14:38:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 14:38:40 +0200 |
| commit | 57b611a5bf7e227498c19e6a09c2d2dbe8c24863 (patch) | |
| tree | 6509f33acaa079657d1f5192d39e607c1dc41cc0 | |
| parent | 8b8ae7959d212c51ada4c1f13df5fb573461d024 (diff) | |
| parent | 2884836e3c26fa76718319cdc6d13136bbc1354d (diff) | |
| download | systemd-57b611a5bf7e227498c19e6a09c2d2dbe8c24863.tar.gz | |
Merge pull request #16074 from msekletar/freezer-test-flakes
Freezer test flakes
| -rw-r--r-- | src/core/slice.c | 2 | ||||
| -rwxr-xr-x | test/units/testsuite-38.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/slice.c b/src/core/slice.c index 38a2805200..f4f63fcb5b 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -403,7 +403,7 @@ static int slice_freezer_action(Unit *s, FreezerAction action) { if (r < 0) return r; - return 0; + return 1; } static int slice_freeze(Unit *s) { diff --git a/test/units/testsuite-38.sh b/test/units/testsuite-38.sh index 6fcadb8f8e..18b7bd6dce 100755 --- a/test/units/testsuite-38.sh +++ b/test/units/testsuite-38.sh @@ -246,6 +246,8 @@ test_preserve_state() { echo -n " - freeze from outside: " echo 1 > /sys/fs/cgroup/"${slice}"/cgroup.freeze + # Give kernel some time to freeze the slice + sleep 1 # Our state should not be affected check_freezer_state "${slice}" "running" @@ -258,6 +260,8 @@ test_preserve_state() { echo -n " - thaw from outside: " echo 0 > /sys/fs/cgroup/"${slice}"/cgroup.freeze + sleep 1 + check_freezer_state "${unit}" "running" check_freezer_state "${slice}" "running" grep -q "frozen 0" /sys/fs/cgroup/"${slice}"/cgroup.events |