containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4110 from mheon/fix_sigproxy_tests 

Fix sig-proxy=false test and use image cache
This commit is contained in:
OpenShift Merge Robot 2019-10-29 15:13:29 +01:00 committed by GitHub
parent f17e152818 224d805db7
commit a56131fef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/run_signal_test.go
View File

@ -19,6 +19,7 @@ import (
) )
const sigCatch = "trap \"echo FOO >> /h/fifo \" 8; echo READY >> /h/fifo; while :; do sleep 0.25; done" const sigCatch = "trap \"echo FOO >> /h/fifo \" 8; echo READY >> /h/fifo; while :; do sleep 0.25; done"
const sigCatch2 = "trap \"echo Received\" SIGFPE; while :; do sleep 0.25; done"
var _ = Describe("Podman run with --sig-proxy", func() { var _ = Describe("Podman run with --sig-proxy", func() {
var ( var (
@ -110,11 +111,11 @@ var _ = Describe("Podman run with --sig-proxy", func() {
}) })
Specify("signals are not forwarded to container with sig-proxy false", func() { Specify("signals are not forwarded to container with sig-proxy false", func() {
signal := syscall.SIGPOLL signal := syscall.SIGFPE
if rootless.IsRootless() { if rootless.IsRootless() {
podmanTest.RestoreArtifact(fedoraMinimal) podmanTest.RestoreArtifact(fedoraMinimal)
} }
session, pid := podmanTest.PodmanPID([]string{"run", "--name", "test2", "--sig-proxy=false", fedoraMinimal, "bash", "-c", sigCatch}) session, pid := podmanTest.PodmanPID([]string{"run", "--name", "test2", "--sig-proxy=false", fedoraMinimal, "bash", "-c", sigCatch2})
ok := WaitForContainer(podmanTest) ok := WaitForContainer(podmanTest)
Expect(ok).To(BeTrue()) Expect(ok).To(BeTrue())
@ -132,7 +133,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(137)) Expect(session.ExitCode()).To(Equal(137))
ok, _ = session.GrepString(fmt.Sprintf("Received %d", signal)) ok, _ = session.GrepString("Received")
Expect(ok).To(BeFalse()) Expect(ok).To(BeFalse())
}) })