Merge pull request #26077 from runcom/fix-TestImportBadURL
integration-cli: fix TestImportBadURL w/o network
This commit is contained in:
commit
83fc63f967
|
@ -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"))
|
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
|
// Depending on your system you can get either of these errors
|
||||||
if !strings.Contains(out, "dial tcp") &&
|
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") {
|
!strings.Contains(out, "Error processing tar file") {
|
||||||
c.Fatalf("expected an error msg but didn't get one.\nErr: %v\nOut: %v", err, out)
|
c.Fatalf("expected an error msg but didn't get one.\nErr: %v\nOut: %v", err, out)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue