opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2275 from edsantiago/fix_blocking_fifo

Browse Source 
e2e tests: sigproxy: fix rare hang condition
This commit is contained in:
OpenShift Merge Robot
2019-02-06 14:00:49 +01:00
committed by GitHub
parent a9f75bf87b 7ee8fe86c1
commit ca6ab2029c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/run_signal_test.go
View File

@ -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}) _, 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() defer uds.Close()
// Wait for the script in the container to alert us that it is READY // 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) time.Sleep(1 * time.Second)
if counter == 15 { if counter == 15 {
os.Exit(1) Fail("Timed out waiting for READY from container")
} }
counter++ counter++
} }
@ -99,7 +99,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
if counter == 15 { if counter == 15 {
os.Exit(1) Fail("timed out waiting for FOO from container")
} }
counter++ counter++
} }