From 648f0139df3ba23111fce431e4379ee431cc831b Mon Sep 17 00:00:00 2001 From: aiordache Date: Wed, 29 Jul 2020 14:43:41 +0200 Subject: [PATCH] add e2e test for compose up on default context Signed-off-by: aiordache --- cli/cmd/compose/compose.go | 6 +++--- tests/e2e/e2e_test.go | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cli/cmd/compose/compose.go b/cli/cmd/compose/compose.go index b8c9ea67..6beac425 100644 --- a/cli/cmd/compose/compose.go +++ b/cli/cmd/compose/compose.go @@ -17,12 +17,12 @@ package compose import ( + "github.com/pkg/errors" + "github.com/spf13/cobra" + apicontext "github.com/docker/api/context" "github.com/docker/api/context/store" "github.com/docker/api/errdefs" - "github.com/pkg/errors" - - "github.com/spf13/cobra" ) // Command returns the compose command with its child commands diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 1dd9f875..f85f0783 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -86,6 +86,15 @@ func (s *E2eSuite) TestContextLsFormat() { Expect(output).To(ContainSubstring(`"Name":"default"`)) } +func (s *E2eSuite) TestComposeOnDefaultContext() { + s.NewDockerCommand("context", "use", "default").ExecOrDie() + output := s.NewDockerCommand("context", "inspect").ExecOrDie() + Expect(output).To(ContainSubstring(`"Name": "default"`)) + output, err := s.NewDockerCommand("compose", "up").Exec() + Expect(err).NotTo(BeNil()) + Expect(output).To(ContainSubstring(`compose command not supported on context type`)) +} + func (s *E2eSuite) TestContextCreateParseErrorDoesNotDelegateToLegacy() { s.Step("should dispay new cli error when parsing context create flags", func() { _, err := s.NewDockerCommand("context", "create", "aci", "--subscription-id", "titi").Exec()