kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Enable engine to take Stderr and Stdout for mocking in tests

Browse source
This commit is contained in:
Michael Crosby 2013-12-05 16:22:49 -08:00
parent 4bea68dfa6
commit 25d3db048e
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
engine/engine.go
View file

@ -3,6 +3,7 @@ package engine
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"io"
"log" "log"
"os" "os"
"runtime" "runtime"
@ -34,6 +35,9 @@ type Engine struct {
handlers map[string]Handler handlers map[string]Handler
hack Hack // data for temporary hackery (see hack.go) hack Hack // data for temporary hackery (see hack.go)
id string id string
Stdout io.Writer
Stderr io.Writer
Stdin io.Reader
} }
func (eng *Engine) Root() string { func (eng *Engine) Root() string {
@ -82,6 +86,9 @@ func New(root string) (*Engine, error) {
root: root, root: root,
handlers: make(map[string]Handler), handlers: make(map[string]Handler),
id: utils.RandomString(), id: utils.RandomString(),
Stdout: os.Stdout,
Stderr: os.Stderr,
Stdin: os.Stdin,
} }
// Copy existing global handlers // Copy existing global handlers
for k, v := range globalHandlers { for k, v := range globalHandlers {
@ -105,8 +112,8 @@ func (eng *Engine) Job(name string, args ...string) *Job {
Stdout: NewOutput(), Stdout: NewOutput(),
Stderr: NewOutput(), Stderr: NewOutput(),
} }
job.Stdout.Add(utils.NopWriteCloser(os.Stdout)) job.Stdout.Add(utils.NopWriteCloser(eng.Stdout))
job.Stderr.Add(utils.NopWriteCloser(os.Stderr)) job.Stderr.Add(utils.NopWriteCloser(eng.Stderr))
handler, exists := eng.handlers[name] handler, exists := eng.handlers[name]
if exists { if exists {
job.handler = handler job.handler = handler
@ -116,5 +123,5 @@ func (eng *Engine) Job(name string, args ...string) *Job {
func (eng *Engine) Logf(format string, args ...interface{}) (n int, err error) { func (eng *Engine) Logf(format string, args ...interface{}) (n int, err error) {
prefixedFormat := fmt.Sprintf("[%s] %s\n", eng, strings.TrimRight(format, "\n")) prefixedFormat := fmt.Sprintf("[%s] %s\n", eng, strings.TrimRight(format, "\n"))
return fmt.Fprintf(os.Stderr, prefixedFormat, args...) return fmt.Fprintf(eng.Stderr, prefixedFormat, args...)
} }

2
integration/utils_test.go
View file

@ -185,6 +185,8 @@ func NewTestEngine(t utils.Fataler) *engine.Engine {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
eng.Stdout = ioutil.Discard
eng.Stderr = ioutil.Discard
// Load default plugins // Load default plugins
// (This is manually copied and modified from main() until we have a more generic plugin system) // (This is manually copied and modified from main() until we have a more generic plugin system)
job := eng.Job("initapi") job := eng.Job("initapi")