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

Merge pull request #3480 from mheon/potential_ps_test_fix

Browse Source 
Restart failed containers in tests
This commit is contained in:
OpenShift Merge Robot
2019-07-09 15:58:50 +02:00
committed by GitHub
parent eb4b7ed12b 1322dbc24f
commit 2843d0dc86
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/common_test.go
View File

@ -530,6 +530,19 @@ func (p *PodmanTestIntegration) RunHealthCheck(cid string) error {
if hc.ExitCode() == 0 { if hc.ExitCode() == 0 {
return nil return nil
} }
// Restart container if it's not running
ps := p.Podman([]string{"ps", "--no-trunc", "--q", "--filter", fmt.Sprintf("id=%s", cid)})
ps.WaitWithDefaultTimeout()
if ps.ExitCode() == 0 {
if !strings.Contains(ps.OutputToString(), cid) {
fmt.Printf("Container %s is not running, restarting", cid)
restart := p.Podman([]string{"restart", cid})
restart.WaitWithDefaultTimeout()
if restart.ExitCode() != 0 {
return errors.Errorf("unable to restart %s", cid)
}
}
}
fmt.Printf("Waiting for %s to pass healthcheck\n", cid) fmt.Printf("Waiting for %s to pass healthcheck\n", cid)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }