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

Merge pull request #10456 from rhatdan/flake1

Browse Source 
Fix race on podman start --all
This commit is contained in:
OpenShift Merge Robot
2021-05-25 09:42:57 -07:00
committed by GitHub
parent d0f5796c39 e6a3d6aacc
commit 8f71881a63
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/common_test.go
View File

@ -408,8 +408,15 @@ func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionInteg
podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") podmanArgs = append(podmanArgs, "-d", ALPINE, "ls")
session := p.Podman(podmanArgs) session := p.Podman(podmanArgs)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
if session.ExitCode() != 0 {
return session, session.ExitCode(), session.OutputToString() return session, session.ExitCode(), session.OutputToString()
} }
cid := session.OutputToString()
wsession := p.Podman([]string{"wait", cid})
wsession.WaitWithDefaultTimeout()
return session, wsession.ExitCode(), cid
}
// RunNginxWithHealthCheck runs the alpine nginx container with an optional name and adds a healthcheck into it // RunNginxWithHealthCheck runs the alpine nginx container with an optional name and adds a healthcheck into it
func (p *PodmanTestIntegration) RunNginxWithHealthCheck(name string) (*PodmanSessionIntegration, string) { func (p *PodmanTestIntegration) RunNginxWithHealthCheck(name string) (*PodmanSessionIntegration, string) {
@ -431,8 +438,15 @@ func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSe
podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") podmanArgs = append(podmanArgs, "-d", ALPINE, "ls")
session := p.Podman(podmanArgs) session := p.Podman(podmanArgs)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
if session.ExitCode() != 0 {
return session, session.ExitCode(), session.OutputToString() return session, session.ExitCode(), session.OutputToString()
} }
cid := session.OutputToString()
wsession := p.Podman([]string{"wait", cid})
wsession.WaitWithDefaultTimeout()
return session, wsession.ExitCode(), cid
}
// BuildImage uses podman build and buildah to build an image // BuildImage uses podman build and buildah to build an image
// called imageName based on a string dockerfile // called imageName based on a string dockerfile

2
test/system/045-start.bats
View File

@ -25,6 +25,8 @@ load helpers
die "podman start --all restarted a running container" die "podman start --all restarted a running container"
fi fi
run_podman wait $cid_none_implicit $cid_none_explicit $cid_on_failure
run_podman rm $cid_none_implicit $cid_none_explicit $cid_on_failure run_podman rm $cid_none_implicit $cid_none_explicit $cid_on_failure
run_podman stop -t 1 $cid_always run_podman stop -t 1 $cid_always
run_podman rm $cid_always run_podman rm $cid_always