Merge pull request #15412 from vdemeester/dont-sleep-too-much

time.Sleep in integration tests — comment and waitRun/waitInspect
This commit is contained in:
Brian Goff
2015-08-21 20:43:55 -04:00
17 changed files with 42 additions and 93 deletions
+4 -2
View File
@@ -1240,10 +1240,12 @@ func runCommandAndReadContainerFile(filename string, cmd *exec.Cmd) ([]byte, err
return nil, fmt.Errorf("%v: %q", err, out)
}
time.Sleep(1 * time.Second)
contID := strings.TrimSpace(out)
if err := waitRun(contID); err != nil {
return nil, fmt.Errorf("%v: %q", contID, err)
}
return readContainerFile(contID, filename)
}