diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-10-05 10:27:18 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-10-07 10:43:02 -0600 |
| commit | 0ab9e39064e5906b80a69d51fab3757ad43f32c5 (patch) | |
| tree | 9f1049eca9db1be36e486128f59bfae41d4b627b /test/system/130-kill.bats | |
| parent | a7500e54a4646c7db477349e2530ac13df77b8fa (diff) | |
| download | podman-0ab9e39064e5906b80a69d51fab3757ad43f32c5.tar.gz podman-0ab9e39064e5906b80a69d51fab3757ad43f32c5.tar.bz2 podman-0ab9e39064e5906b80a69d51fab3757ad43f32c5.zip | |
system tests: cleanup, and add more tests
- images test: add test for 'table' and '\t' formatting
- image mount test: check output from 'umount', test
repeat umount (NOP), and test invalid-umount
- kill test: remove kludgy workaround for crun signal bug
ref: #5004 -- code is no longer needed (fingers crossed),
and the workaround involved pulling an expensive image.
- selinux test: add new tests for shared context in:
* pods , w/ and w/o infra container (ref: #7902)
* containers with namespace sharing: --ipc, --pid, --net
- selinux test: new test for --pid=host (disabled pending
propagation of container-selinux-2.146, ref: #7939)
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/130-kill.bats')
| -rw-r--r-- | test/system/130-kill.bats | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats index c16e64c58..3770eac27 100644 --- a/test/system/130-kill.bats +++ b/test/system/130-kill.bats @@ -6,23 +6,9 @@ load helpers @test "podman kill - test signal handling in containers" { - # podman-remote and crun interact poorly in f31: crun seems to gobble up - # some signals. - # Workaround: run 'env --default-signal sh' instead of just 'sh' in - # the container. Since env on our regular alpine image doesn't support - # that flag, we need to pull fedora-minimal. See: - # https://github.com/containers/podman/issues/5004 - # FIXME: remove this kludge once we get rid of podman-remote - local _image=$IMAGE - local _sh_cmd="sh" - if is_remote; then - _image=quay.io/libpod/fedora-minimal:latest - _sh_cmd="env --default-signal sh" - fi - # Start a container that will handle all signals by emitting 'got: N' local -a signals=(1 2 3 4 5 6 8 10 12 13 14 15 16 20 21 22 23 24 25 26 64) - run_podman run -d $_image $_sh_cmd -c \ + run_podman run -d $IMAGE sh -c \ "for i in ${signals[*]}; do trap \"echo got: \$i\" \$i; done; echo READY; while ! test -e /stop; do sleep 0.05; done; @@ -81,10 +67,6 @@ load helpers run_podman wait $cid run_podman rm $cid wait $podman_log_pid - - if [[ $_image != $IMAGE ]]; then - run_podman rmi $_image - fi } @test "podman kill - rejects invalid args" { |