diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-29 15:13:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 15:13:29 +0100 |
| commit | a56131fef4a82824b397c94f6b7edcdb24769624 (patch) | |
| tree | fc38d18a0a8567611bf34b37c2d1d2189d7fe287 | |
| parent | f17e15281800eb342c725f56b1e7ff7e10a8f790 (diff) | |
| parent | 224d805db788397b6d74f58496ffbbdb147edd83 (diff) | |
| download | podman-a56131fef4a82824b397c94f6b7edcdb24769624.tar.gz podman-a56131fef4a82824b397c94f6b7edcdb24769624.tar.bz2 podman-a56131fef4a82824b397c94f6b7edcdb24769624.zip | |
Merge pull request #4110 from mheon/fix_sigproxy_tests
Fix sig-proxy=false test and use image cache
| -rw-r--r-- | test/e2e/run_signal_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 1dbac1dc9..1d57e6211 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -19,6 +19,7 @@ import ( ) 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 ( @@ -110,11 +111,11 @@ var _ = Describe("Podman run with --sig-proxy", func() { }) Specify("signals are not forwarded to container with sig-proxy false", func() { - signal := syscall.SIGPOLL + signal := syscall.SIGFPE if rootless.IsRootless() { 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) Expect(ok).To(BeTrue()) @@ -132,7 +133,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(137)) - ok, _ = session.GrepString(fmt.Sprintf("Received %d", signal)) + ok, _ = session.GrepString("Received") Expect(ok).To(BeFalse()) }) |