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

update test 

Signed-off-by: aiordache <anca.iordache@docker.com>
This commit is contained in:
aiordache 2021-03-05 16:30:52 +01:00
parent 34df3caaaf
commit fef479ad1f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/main.go
View File

@ -212,7 +212,7 @@ func main() {
compose.Command(ctype), compose.Command(ctype),
volume.Command(ctype), volume.Command(ctype),
) )
if ctype == store.LocalContextType { if ctype == store.DefaultContextType || ctype == store.LocalContextType {
if len(opts.Hosts) > 0 { if len(opts.Hosts) > 0 {
opts.Context = "" opts.Context = ""
currentContext = "default" currentContext = "default"

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

@ -396,15 +396,14 @@ func TestLegacy(t *testing.T) {
}) })
t.Run("host flag", func(t *testing.T) { t.Run("host flag", func(t *testing.T) {
stderr := "dial tcp: lookup nonexistent" stderr := []string{"dial tcp: lookup nonexistent", "no such host"}
if runtime.GOOS == "windows" {
stderr = "dial tcp: lookup nonexistent: no such host"
}
res := c.RunDockerOrExitError("-H", "tcp://nonexistent:123", "version") res := c.RunDockerOrExitError("-H", "tcp://nonexistent:123", "version")
res.Assert(t, icmd.Expected{ res.Assert(t, icmd.Expected{
ExitCode: 1, ExitCode: 1,
}) })
assert.Assert(t, strings.Contains(res.Stderr(), stderr), res.Stderr()) for _, s := range stderr {
assert.Assert(t, strings.Contains(res.Stderr(), s), res.Stderr())
}
}) })
t.Run("existing contexts delegate", func(t *testing.T) { t.Run("existing contexts delegate", func(t *testing.T) {