From e2be3fee02acafce02a8872c9a9340f304eed830 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Sat, 27 Aug 2016 23:57:50 +0200 Subject: [PATCH] integration-cli: fix TestImportBadURL w/o network As explained in the test comment itself, the error message may vary on different platform. This patch adds another condition found while testing w/o network access on RHEL based distros (Fedora, RHEL, CentOS). Signed-off-by: Antonio Murdaca --- integration-cli/docker_cli_import_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index dc07fb40ee..2c85c34128 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -37,6 +37,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) }