From b191e3b70bafd06bc0ccb08245505c11aedb8f65 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Mon, 23 May 2016 10:00:01 -0700 Subject: [PATCH] Fix docker import tests For me when I run the test I see: ``` Downloading from http://nourl/bad Importing 283 B Untar re-exec error: exit status 1: output: unexpected EOF ``` and nothing about "dial tcp" so it appears that the output is system dependent and therefore we can't really check it. I think checking for non-zero exit code is sufficient so I'm removing this string check. Signed-off-by: Doug Davis --- chrootarchive/archive_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrootarchive/archive_unix.go b/chrootarchive/archive_unix.go index 54a299b..f2325ab 100644 --- a/chrootarchive/archive_unix.go +++ b/chrootarchive/archive_unix.go @@ -80,7 +80,7 @@ func invokeUnpack(decompressedArchive io.Reader, dest string, options *archive.T // pending on write pipe forever io.Copy(ioutil.Discard, decompressedArchive) - return fmt.Errorf("Untar re-exec error: %v: output: %s", err, output) + return fmt.Errorf("Error processing tar file(%v): %s", err, output) } return nil }