diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-06 14:00:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 14:00:49 +0100 |
| commit | ca6ab2029caae9fcea35579c87634a0520284aae (patch) | |
| tree | 76824d470641f683eb15531ea1135b60aa2331b9 /test/e2e | |
| parent | a9f75bf87b56e132a636ec92a8d185a80a0e12aa (diff) | |
| parent | 7ee8fe86c162331630c7d1e16a28f68b7f8ac143 (diff) | |
| download | podman-ca6ab2029caae9fcea35579c87634a0520284aae.tar.gz podman-ca6ab2029caae9fcea35579c87634a0520284aae.tar.bz2 podman-ca6ab2029caae9fcea35579c87634a0520284aae.zip | |
Merge pull request #2275 from edsantiago/fix_blocking_fifo
e2e tests: sigproxy: fix rare hang condition
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/run_signal_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 9be8e7810..51c14602e 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -55,7 +55,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { _, pid := podmanTest.PodmanPID([]string{"run", "-it", "-v", fmt.Sprintf("%s:/h:Z", udsDir), fedoraMinimal, "bash", "-c", sigCatch}) - uds, _ := os.OpenFile(udsPath, os.O_RDONLY, 0600) + uds, _ := os.OpenFile(udsPath, os.O_RDONLY|syscall.O_NONBLOCK, 0600) defer uds.Close() // Wait for the script in the container to alert us that it is READY @@ -73,7 +73,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { } time.Sleep(1 * time.Second) if counter == 15 { - os.Exit(1) + Fail("Timed out waiting for READY from container") } counter++ } @@ -99,7 +99,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { } time.Sleep(1 * time.Second) if counter == 15 { - os.Exit(1) + Fail("timed out waiting for FOO from container") } counter++ } |