summaryrefslogtreecommitdiff
path: root/test/system/130-kill.bats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-05-12 15:59:46 -0400
committerGitHub <noreply@github.com>2021-05-12 15:59:46 -0400
commitd6507fcfbce90b06a2b611a4cddadc3f64d51a4e (patch)
tree98d2001ec68f032e8132bc55f960ef71cc712ec3 /test/system/130-kill.bats
parentd8dc56ba6758e590d14fca0c733246454837faf9 (diff)
parentd32863bbb4a2c2e8592766d84e16140fa71dcaa3 (diff)
downloadpodman-d6507fcfbce90b06a2b611a4cddadc3f64d51a4e.tar.gz
podman-d6507fcfbce90b06a2b611a4cddadc3f64d51a4e.tar.bz2
podman-d6507fcfbce90b06a2b611a4cddadc3f64d51a4e.zip
Merge pull request #10222 from vrothberg/image-tree
podman image tree: restore previous behavior
Diffstat (limited to 'test/system/130-kill.bats')
-rw-r--r--test/system/130-kill.bats3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats
index 3770eac27..1b02b4976 100644
--- a/test/system/130-kill.bats
+++ b/test/system/130-kill.bats
@@ -8,7 +8,8 @@ load helpers
@test "podman kill - test signal handling in containers" {
# 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 -c \
+ # Force the k8s-file driver until #10323 is fixed.
+ run_podman run --log-driver=k8s-file -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;