From 4be54355691f06f43951952b44e311b677d4c9d1 Mon Sep 17 00:00:00 2001 From: lifubang Date: Tue, 2 Jun 2020 18:55:15 +0800 Subject: [PATCH] add integration test for ps/kill after the container stopped Signed-off-by: lifubang --- tests/integration/kill.bats | 4 ++++ tests/integration/ps.bats | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/tests/integration/kill.bats b/tests/integration/kill.bats index d9afe927..ef8de3b2 100644 --- a/tests/integration/kill.bats +++ b/tests/integration/kill.bats @@ -25,6 +25,10 @@ function teardown() { retry 10 1 eval "__runc state test_busybox | grep -q 'stopped'" + # we should ensure kill work after the container stopped + runc kill -a test_busybox 0 + [ "$status" -eq 0 ] + runc delete test_busybox [ "$status" -eq 0 ] } diff --git a/tests/integration/ps.bats b/tests/integration/ps.bats index 646b5ab7..e8ea5532 100644 --- a/tests/integration/ps.bats +++ b/tests/integration/ps.bats @@ -60,3 +60,27 @@ function teardown() { [[ ${lines[0]} =~ \ +PID\ +TTY\ +STAT\ +TIME\ +COMMAND+ ]] [[ "${lines[1]}" =~ [0-9]+ ]] } + +@test "ps after the container stopped" { + # ps requires cgroups + [[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup + set_cgroups_path "$BUSYBOX_BUNDLE" + + # start busybox detached + runc run -d --console-socket $CONSOLE_SOCKET test_busybox + [ "$status" -eq 0 ] + + # check state + testcontainer test_busybox running + + runc ps test_busybox + [ "$status" -eq 0 ] + + runc kill test_busybox KILL + [ "$status" -eq 0 ] + + retry 10 1 eval "__runc state test_busybox | grep -q 'stopped'" + + runc ps test_busybox + [ "$status" -eq 0 ] +}