Skip to content

Commit

Permalink
Merge pull request #3804 from edsantiago/bats
Browse files Browse the repository at this point in the history
tests for exit status on podman run --rm
  • Loading branch information
openshift-merge-robot authored Aug 15, 2019
2 parents bf9e801 + 4fb7036 commit f9ddf91
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 0 deletions.
13 changes: 13 additions & 0 deletions test/system/030-run.bats
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,17 @@ echo $rand | 0 | $rand
is "$output" "" "unwanted /sys/kernel in 'mount' output (with --net=host)"
}

# 'run --rm' goes through different code paths and may lose exit status.
# See https://github.com/containers/libpod/issues/3795
@test "podman run --rm" {
skip_if_remote "podman-remote does not handle exit codes"

run_podman 0 run --rm $IMAGE /bin/true
run_podman 1 run --rm $IMAGE /bin/false

# Believe it or not, 'sh -c' resulted in different behavior
run_podman 0 run --rm $IMAGE sh -c /bin/true
run_podman 1 run --rm $IMAGE sh -c /bin/false
}

# vim: filetype=sh
42 changes: 42 additions & 0 deletions test/system/055-rm.bats
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/usr/bin/env bats -*- bats -*-
#
# tests for podman rm
#

load helpers

@test "podman rm" {
rand=$(random_string 30)
run_podman run --name $rand $IMAGE /bin/true

# Don't care about output, just check exit status (it should exist)
run_podman 0 inspect $rand

# container should be in output of 'ps -a'
run_podman ps -a
is "$output" ".* $IMAGE .*/true .* $rand" "Container present in 'ps -a'"

# Remove container; now 'inspect' should fail
run_podman rm $rand
run_podman 125 inspect $rand
}

# I'm sorry! This test takes 13 seconds. There's not much I can do about it,
# please know that I think it's justified: podman 1.5.0 had a strange bug
# in with exit status was not preserved on some code paths with 'rm -f'
# or 'podman run --rm' (see also 030-run.bats). The test below is a bit
# kludgy: what we care about is the exit status of the killed container,
# not 'podman rm', but BATS has no provision (that I know of) for forking,
# so what we do is start the 'rm' beforehand and monitor the exit status
# of the 'sleep' container.
#
# See https://github.com/containers/libpod/issues/3795
@test "podman rm -f" {
skip_if_remote "podman-remote does not handle exit codes"

rand=$(random_string 30)
( sleep 3; run_podman rm -f $rand ) &
run_podman 137 run --name $rand $IMAGE sleep 30
}

# vim: filetype=sh

0 comments on commit f9ddf91

Please sign in to comment.