diff options
| author | Victor Vieux <victor.vieux@docker.com> | 2014-01-22 13:35:35 -0800 |
|---|---|---|
| committer | Victor Vieux <victor.vieux@docker.com> | 2014-01-24 14:46:31 -0800 |
| commit | 9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c (patch) | |
| tree | 6e18265a8f6fba3cb0fd0d88a50b0824aa27089f /engine | |
| parent | 9d44298c5e733e0e36973a765af77b28861d542d (diff) | |
| download | docker-9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c.tar.gz | |
move pull and import to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/engine.go | 7 | ||||
| -rw-r--r-- | engine/job.go | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/engine/engine.go b/engine/engine.go index ff69dcd138..ec880b9c85 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -137,6 +137,9 @@ func (eng *Engine) Job(name string, args ...string) *Job { } func (eng *Engine) Logf(format string, args ...interface{}) (n int, err error) { - prefixedFormat := fmt.Sprintf("[%s] %s\n", eng, strings.TrimRight(format, "\n")) - return fmt.Fprintf(eng.Stderr, prefixedFormat, args...) + if os.Getenv("TEST") == "" { + prefixedFormat := fmt.Sprintf("[%s] %s\n", eng, strings.TrimRight(format, "\n")) + return fmt.Fprintf(eng.Stderr, prefixedFormat, args...) + } + return 0, nil } diff --git a/engine/job.go b/engine/job.go index 68b1715d92..179b2ebdda 100644 --- a/engine/job.go +++ b/engine/job.go @@ -3,6 +3,7 @@ package engine import ( "fmt" "io" + "os" "strings" "time" ) @@ -176,8 +177,11 @@ func (job *Job) Environ() map[string]string { } func (job *Job) Logf(format string, args ...interface{}) (n int, err error) { - prefixedFormat := fmt.Sprintf("[%s] %s\n", job, strings.TrimRight(format, "\n")) - return fmt.Fprintf(job.Stderr, prefixedFormat, args...) + if os.Getenv("TEST") == "" { + prefixedFormat := fmt.Sprintf("[%s] %s\n", job, strings.TrimRight(format, "\n")) + return fmt.Fprintf(job.Stderr, prefixedFormat, args...) + } + return 0, nil } func (job *Job) Printf(format string, args ...interface{}) (n int, err error) { |