tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't include stderr in moby exec output

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-04-09 15:09:48 +02:00
parent 76cd14a85d
commit 4916b36b99
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
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

@ -398,8 +398,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) {
@ -408,7 +407,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) {