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

Do not display exit status when classic cli exit in error

Browse Source
This commit is contained in:
Guillaume Tardif 2020-06-05 17:08:42 +02:00
parent e84b508e80
commit 54141a9bdd
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cli/dockerclassic/exec.go
View File

@ -27,7 +27,6 @@ func Exec(ctx context.Context) {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
if exiterr, ok := err.(*exec.ExitError); ok { if exiterr, ok := err.(*exec.ExitError); ok {
fmt.Fprintln(os.Stderr, exiterr.Error())
os.Exit(exiterr.ExitCode()) os.Exit(exiterr.ExitCode())
} }
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)

6
tests/e2e/e2e_test.go
View File

@ -156,6 +156,12 @@ func (s *E2eSuite) TestLegacy() {
}) })
} }
func (s *E2eSuite) TestLeaveLegacyErrorMessagesUnchanged() {
output, err := s.NewDockerCommand("foo").Exec()
golden.Assert(s.T(), output, "unknown-foo-command.golden")
Expect(err).NotTo(BeNil())
}
func (s *E2eSuite) TestMockBackend() { func (s *E2eSuite) TestMockBackend() {
It("creates a new test context to hardcoded example backend", func() { It("creates a new test context to hardcoded example backend", func() {
s.NewDockerCommand("context", "create", "test-example", "example").ExecOrDie() s.NewDockerCommand("context", "create", "test-example", "example").ExecOrDie()

2
tests/e2e/testdata/unknown-foo-command.golden vendored Normal file
View File

@ -0,0 +1,2 @@
docker: 'foo' is not a docker command.
See 'docker --help'