Merge pull request #26077 from runcom/fix-TestImportBadURL

integration-cli: fix TestImportBadURL w/o network
This commit is contained in:
Tõnis Tiigi 2016-09-01 09:30:02 -07:00 committed by GitHub
commit 83fc63f967
1 changed files with 1 additions and 0 deletions

View File

@ -36,6 +36,7 @@ func (s *DockerSuite) TestImportBadURL(c *check.C) {
c.Assert(err, checker.NotNil, check.Commentf("import was supposed to fail but didn't"))
// Depending on your system you can get either of these errors
if !strings.Contains(out, "dial tcp") &&
!strings.Contains(out, "ApplyLayer exit status 1 stdout: stderr: archive/tar: invalid tar header") &&
!strings.Contains(out, "Error processing tar file") {
c.Fatalf("expected an error msg but didn't get one.\nErr: %v\nOut: %v", err, out)
}