Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: add retry for killing container with host pidns #4164

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −4
Open

test: add retry for killing container with host pidns #4164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions tests/integration/kill.bats
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@ test_host_pidns_kill() {
# kills the container; see "kill KILL [host pidns + init gone]"
# below).
kill -9 "$init_pid"
wait_for_container 10 1 test_busybox stopped
fi

# Get the list of all container processes.
Expand All @@ -58,11 +59,16 @@ test_host_pidns_kill() {

runc kill test_busybox KILL
[ "$status" -eq 0 ]
wait_for_container 10 1 test_busybox stopped

# Make sure all processes are gone.
pids=$(cat "$cgpath"/cgroup.procs) || true # OK if cgroup is gone
echo "pids: $pids"
retry=0
while [ $retry -lt 10 ] && [ -n "$pids" ]; do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can do

while [ $((retry++)) -lt 10 ] && [ -n "$pids" ]; do

# Make sure all processes are gone.
pids=$(cat "$cgpath"/cgroup.procs) || true # OK if cgroup is gone
echo "pids: $pids"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add retry counter here, e.g.

echo "try $retry; pids: $pids"

if [ -n "$pids" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: no need for this condition

retry=$((retry + 1))
fi
done
[ -z "$pids" ]
}

Expand Down