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

Merge pull request #1516 from docker/version_json 

don't include stderr in moby exec output
This commit is contained in:
Nicolas De loof 2021-04-13 15:43:27 +02:00 committed by GitHub
parent 31e93963f7 4916b36b99
commit 0b968395dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/mobycli/exec.go
View File

@ -136,5 +136,6 @@ func ExecSilent(ctx context.Context, args ...string) ([]byte, error) {
args = os.Args[1:] args = os.Args[1:]
} }
cmd := exec.CommandContext(ctx, ComDockerCli, args...) cmd := exec.CommandContext(ctx, ComDockerCli, args...)
return cmd.CombinedOutput() cmd.Stderr = os.Stderr
return cmd.Output()
} }

5
local/e2e/cli-only/e2e_test.go
View File

@ -397,8 +397,7 @@ func TestLegacy(t *testing.T) {
t.Run("host flag", func(t *testing.T) { t.Run("host flag", func(t *testing.T) {
res := c.RunDockerOrExitError("-H", "tcp://nonexistent:123", "version") res := c.RunDockerOrExitError("-H", "tcp://nonexistent:123", "version")
assert.Assert(t, res.ExitCode == 1) assert.Assert(t, res.ExitCode == 1)
assert.Assert(t, strings.Contains(res.Stdout(), "dial tcp: lookup nonexistent"), res.Stdout()) assert.Assert(t, strings.Contains(res.Stderr(), "dial tcp: lookup nonexistent"), res.Stderr())
}) })
t.Run("remote engine context", func(t *testing.T) { t.Run("remote engine context", func(t *testing.T) {
@ -407,7 +406,7 @@ func TestLegacy(t *testing.T) {
res := c.RunDockerOrExitError("version") res := c.RunDockerOrExitError("version")
assert.Assert(t, res.ExitCode == 1) assert.Assert(t, res.ExitCode == 1)
assert.Assert(t, strings.Contains(res.Stdout(), "dial tcp: lookup nonexistent"), res.Stdout()) assert.Assert(t, strings.Contains(res.Stderr(), "dial tcp: lookup nonexistent"), res.Stderr())
}) })
t.Run("existing contexts delegate", func(t *testing.T) { t.Run("existing contexts delegate", func(t *testing.T) {