diff options
| author | Matthew Heon <mheon@redhat.com> | 2019-09-25 16:25:47 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-10-22 16:17:29 -0400 |
| commit | 224d805db788397b6d74f58496ffbbdb147edd83 (patch) | |
| tree | d07ad8abca143cee75c14bde3304c38e8c946065 | |
| parent | a7f266891ca20214f56d0bb742896e9112f4905a (diff) | |
| download | podman-224d805db788397b6d74f58496ffbbdb147edd83.tar.gz podman-224d805db788397b6d74f58496ffbbdb147edd83.tar.bz2 podman-224d805db788397b6d74f58496ffbbdb147edd83.zip | |
Fix sig-proxy=false test and use image cache
Pulling fedora-minimal was potentially causing timeouts, which is
bad. Using the cache avoids that.
Sig-proxy=false test was entirely nonfunctional - I think we
didn't update it when we fixed sig-proxy=true to be less racy.
It was still passing, which is concerning.
Signed-off-by: Matthew Heon <mheon@redhat.com>
| -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()) }) |