Merge pull request #2179 from nicksieger/fix-windows-missing-existing-cli

nicksieger · web-flow · commit 4dc3e196a441 · 2022-07-27T10:05:23.000-05:00
Fix Windows e2e-local test
diff --git a/local/e2e/cli-only/e2e_test.go b/local/e2e/cli-only/e2e_test.go
@@ -30,6 +30,7 @@ import (
 	"gotest.tools/v3/golden"
 	"gotest.tools/v3/icmd"
 
+	"github.com/docker/compose-cli/cli/mobycli"
 	. "github.com/docker/compose-cli/utils/e2e"
 )
 
@@ -354,7 +355,7 @@ func TestMissingExistingCLI(t *testing.T) {
 	res := icmd.RunCmd(c)
 	res.Assert(t, icmd.Expected{
 		ExitCode: 1,
-		Err:      `"com.docker.cli": executable file not found`,
+		Err:      fmt.Sprintf(`"%s": executable file not found`, mobycli.ComDockerCli),
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ import (`
`30`	`30`	`"gotest.tools/v3/golden"`
`31`	`31`	`"gotest.tools/v3/icmd"`
`32`	`32`
	`33`	`+ "github.com/docker/compose-cli/cli/mobycli"`
`33`	`34`	`. "github.com/docker/compose-cli/utils/e2e"`
`34`	`35`	`)`
`35`	`36`
`@@ -354,7 +355,7 @@ func TestMissingExistingCLI(t *testing.T) {`
`354`	`355`	`res := icmd.RunCmd(c)`
`355`	`356`	`res.Assert(t, icmd.Expected{`
`356`	`357`	`ExitCode: 1,`
`357`		- Err: `"com.docker.cli": executable file not found`,
	`358`	+ Err: fmt.Sprintf(`"%s": executable file not found`, mobycli.ComDockerCli),
`358`	`359`	`})`
`359`	`360`	`}`
`360`	`361`