Merge pull request #29845 from vdemeester/fix-the-fix-facepalming-myself

[test-integration] Should check for output, not error in deleteContainer
Upstream-commit: 40afb853d718358a26b01d6e796f80f8cf0c5728
Component: engine
This commit is contained in:
Tibor Vass
2017-01-05 13:26:39 -08:00
committed by GitHub
@@ -124,7 +124,7 @@ func deleteContainer(ignoreNoSuchContainer bool, container ...string) error {
if ignoreNoSuchContainer && result.Error != nil {
// If the error is "No such container: ..." this means the container doesn't exists anymore,
// we can safely ignore that one.
if strings.Contains(result.Error.Error(), "No such container") {
if strings.Contains(result.Stderr(), "No such container") {
return nil
}
}