docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1049 from dotcloud/1040_ignore_stderr_tests-fix 

- Tests: Ignore stderr while doing tests
This commit is contained in:
Guillaume J. Charmes 2013-07-09 10:32:24 -07:00
parent 72d278fdac 800d900688
commit ada0e1fb08
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands.go
View File

@ -1267,7 +1267,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
} }
for _, warning := range runResult.Warnings { for _, warning := range runResult.Warnings {
fmt.Fprintln(cli.err, "WARNING: ", warning) fmt.Fprintf(cli.err, "WARNING: %s\n", warning)
} }
//start the container //start the container

5
commands_test.go
View File

@ -132,11 +132,12 @@ func TestImages(t *testing.T) {
} }
*/ */
// TestRunHostname checks that 'docker run -h' correctly sets a custom hostname // TestRunHostname checks that 'docker run -h' correctly sets a custom hostname
func TestRunHostname(t *testing.T) { func TestRunHostname(t *testing.T) {
stdout, stdoutPipe := io.Pipe() stdout, stdoutPipe := io.Pipe()
cli := NewDockerCli(nil, stdoutPipe, nil, testDaemonProto, testDaemonAddr) cli := NewDockerCli(nil, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
defer cleanup(globalRuntime) defer cleanup(globalRuntime)
c := make(chan struct{}) c := make(chan struct{})
@ -329,7 +330,7 @@ func TestRunAttachStdin(t *testing.T) {
stdin, stdinPipe := io.Pipe() stdin, stdinPipe := io.Pipe()
stdout, stdoutPipe := io.Pipe() stdout, stdoutPipe := io.Pipe()
cli := NewDockerCli(stdin, stdoutPipe, nil, testDaemonProto, testDaemonAddr) cli := NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
defer cleanup(globalRuntime) defer cleanup(globalRuntime)
ch := make(chan struct{}) ch := make(chan struct{})