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

e2e: use Compose for exec test 

This was using `docker exec` on Compose containers instead of
`docker compose exec` (and `docker-compose exec` for standalone).

Thanks to @glours for catching!

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This commit is contained in:
Milas Bowman 2022-06-16 16:42:49 -04:00
parent 9622395c8a
commit 3248b7b335
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/e2e/compose_exec_test.go
View File

@ -29,21 +29,25 @@ func TestLocalComposeExec(t *testing.T) {
const projectName = "compose-e2e-exec" const projectName = "compose-e2e-exec"
c.RunDockerComposeCmd(t, "--project-directory", "fixtures/simple-composefile", "--project-name", projectName, "up", cmdArgs := func(cmd string, args ...string) []string {
"-d") ret := []string{"--project-directory", "fixtures/simple-composefile", "--project-name", projectName, cmd}
ret = append(ret, args...)
return ret
}
c.RunDockerComposeCmd(t, cmdArgs("up", "-d")...)
t.Run("exec true", func(t *testing.T) { t.Run("exec true", func(t *testing.T) {
res := c.RunDockerOrExitError(t, "exec", "compose-e2e-exec-simple-1", "/bin/true") c.RunDockerComposeCmd(t, cmdArgs("exec", "simple", "/bin/true")...)
res.Assert(t, icmd.Expected{ExitCode: 0})
}) })
t.Run("exec false", func(t *testing.T) { t.Run("exec false", func(t *testing.T) {
res := c.RunDockerOrExitError(t, "exec", "compose-e2e-exec-simple-1", "/bin/false") res := c.RunDockerComposeCmdNoCheck(t, cmdArgs("exec", "simple", "/bin/false")...)
res.Assert(t, icmd.Expected{ExitCode: 1}) res.Assert(t, icmd.Expected{ExitCode: 1})
}) })
t.Run("exec with env set", func(t *testing.T) { t.Run("exec with env set", func(t *testing.T) {
res := icmd.RunCmd(c.NewDockerCmd(t, "exec", "-e", "FOO", "compose-e2e-exec-simple-1", "/usr/bin/env"), res := icmd.RunCmd(c.NewDockerComposeCmd(t, cmdArgs("exec", "-e", "FOO", "simple", "/usr/bin/env")...),
func(cmd *icmd.Cmd) { func(cmd *icmd.Cmd) {
cmd.Env = append(cmd.Env, "FOO=BAR") cmd.Env = append(cmd.Env, "FOO=BAR")
}) })
@ -51,8 +55,7 @@ func TestLocalComposeExec(t *testing.T) {
}) })
t.Run("exec without env set", func(t *testing.T) { t.Run("exec without env set", func(t *testing.T) {
res := c.RunDockerOrExitError(t, "exec", "-e", "FOO", "compose-e2e-exec-simple-1", "/usr/bin/env") res := c.RunDockerComposeCmd(t, cmdArgs("exec", "-e", "FOO", "simple", "/usr/bin/env")...)
res.Assert(t, icmd.Expected{ExitCode: 0}) assert.Check(t, !strings.Contains(res.Stdout(), "FOO="), res.Combined())
assert.Check(t, !strings.Contains(res.Stdout(), "FOO="))
}) })
} }