github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-12 11:52:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix consumeAndLogOutput

Browse Source 
Primarily, make it actually work; reading into a non-zero-capacity but
zero-length slice would just return 0, the goroutine would terminate,
and even the producer of the output could fail with EPIPE/SIGPIPE.

Also make the logged output readable, converting it into a string
instead of a series of hexadecimal byte values.
This commit is contained in:
Miloslav Trmač 2016-06-22 15:31:29 +02:00
parent 2f2a688026
commit 601f76f96d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integration/utils.go
View File

@ -2,6 +2,7 @@ package main
import ( import (
"io" "io"
"strings"
"github.com/go-check/check" "github.com/go-check/check"
) )
@ -14,11 +15,11 @@ func consumeAndLogOutput(c *check.C, id string, f io.ReadCloser, err error) {
f.Close() f.Close()
c.Logf("Output %s: Closed", id) c.Logf("Output %s: Closed", id)
}() }()
buf := make([]byte, 0, 1024) buf := make([]byte, 1024)
for { for {
c.Logf("Output %s: waiting", id) c.Logf("Output %s: waiting", id)
n, err := f.Read(buf) n, err := f.Read(buf)
c.Logf("Output %s: got %d,%#v: %#v", id, n, err, buf[:n]) c.Logf("Output %s: got %d,%#v: %s", id, n, err, strings.TrimSuffix(string(buf[:n]), "\n"))
if n <= 0 { if n <= 0 {
break break
} }