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

local.e2e: Fix Compose start/stop tests 

* Fix strings.Contains ordering
* Correct logic

Signed-off-by: Chris Crone <christopher.crone@docker.com>
This commit is contained in:
Chris Crone 2021-04-15 14:39:50 +02:00 committed by Guillaume Tardif
parent 04bba675d2
commit c804b7a5a6
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
local/e2e/compose/start_stop_test.go
View File

@ -44,55 +44,52 @@ func TestStartStop(t *testing.T) {
} }
t.Run("Up a project", func(t *testing.T) { t.Run("Up a project", func(t *testing.T) {
res := c.RunDockerOrExitError("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "up", "-d") res := c.RunDockerCmd("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "up", "-d")
assert.Assert(t, strings.Contains("Container e2e-start-stop_simple_1 Started", res.Stdout()), res.Stdout()) assert.Assert(t, strings.Contains(res.Combined(), "Container e2e-start-stop_simple_1 Started"), res.Combined())
res = c.RunDockerOrExitError("compose", "ls", "--all") res = c.RunDockerCmd("compose", "ls", "--all")
testify.Regexp(t, getProjectRegx("running"), res.Stdout()) testify.Regexp(t, getProjectRegx("running"), res.Stdout())
res = c.RunDockerOrExitError("compose", "--project-name", projectName, "ps") res = c.RunDockerCmd("compose", "--project-name", projectName, "ps")
testify.Regexp(t, getServiceRegx("simple", "running"), res.Stdout()) testify.Regexp(t, getServiceRegx("simple", "running"), res.Stdout())
testify.Regexp(t, getServiceRegx("another", "running"), res.Stdout()) testify.Regexp(t, getServiceRegx("another", "running"), res.Stdout())
}) })
t.Run("stop project", func(t *testing.T) { t.Run("stop project", func(t *testing.T) {
c.RunDockerOrExitError("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "stop") c.RunDockerCmd("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "stop")
res := c.RunDockerOrExitError("compose", "ls") res := c.RunDockerCmd("compose", "ls")
assert.Assert(t, !strings.Contains("e2e-start-stop", res.Combined()), res.Combined()) assert.Assert(t, !strings.Contains(res.Combined(), "e2e-start-stop"), res.Combined())
res = c.RunDockerOrExitError("compose", "ls", "--all") res = c.RunDockerCmd("compose", "ls", "--all")
testify.Regexp(t, getProjectRegx("exited"), res.Stdout()) testify.Regexp(t, getProjectRegx("exited"), res.Stdout())
res = c.RunDockerOrExitError("compose", "--project-name", projectName, "ps") res = c.RunDockerCmd("compose", "--project-name", projectName, "ps")
assert.Assert(t, !strings.Contains("e2e-start-stop_words_1", res.Combined()), res.Combined()) assert.Assert(t, !strings.Contains(res.Combined(), "e2e-start-stop_words_1"), res.Combined())
res = c.RunDockerOrExitError("compose", "--project-name", projectName, "ps", "--all") res = c.RunDockerCmd("compose", "--project-name", projectName, "ps", "--all")
testify.Regexp(t, getServiceRegx("simple", "exited"), res.Stdout()) testify.Regexp(t, getServiceRegx("simple", "exited"), res.Stdout())
testify.Regexp(t, getServiceRegx("another", "exited"), res.Stdout()) testify.Regexp(t, getServiceRegx("another", "exited"), res.Stdout())
}) })
t.Run("start project", func(t *testing.T) { t.Run("start project", func(t *testing.T) {
c.RunDockerOrExitError("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "start") c.RunDockerCmd("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "start")
res := c.RunDockerOrExitError("compose", "ls") res := c.RunDockerCmd("compose", "ls")
testify.Regexp(t, getProjectRegx("running"), res.Stdout()) testify.Regexp(t, getProjectRegx("running"), res.Stdout())
}) })
t.Run("pause project", func(t *testing.T) { t.Run("pause project", func(t *testing.T) {
c.RunDockerOrExitError("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "pause") c.RunDockerCmd("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "pause")
res := c.RunDockerOrExitError("compose", "ls") res := c.RunDockerCmd("compose", "ls", "--all")
assert.Assert(t, !strings.Contains("e2e-start-stop", res.Combined()), res.Combined())
res = c.RunDockerOrExitError("compose", "ls", "--all")
testify.Regexp(t, getProjectRegx("paused"), res.Stdout()) testify.Regexp(t, getProjectRegx("paused"), res.Stdout())
}) })
t.Run("unpause project", func(t *testing.T) { t.Run("unpause project", func(t *testing.T) {
c.RunDockerOrExitError("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "unpause") c.RunDockerCmd("compose", "-f", "./fixtures/start-stop/compose.yml", "--project-name", projectName, "unpause")
res := c.RunDockerOrExitError("compose", "ls") res := c.RunDockerCmd("compose", "ls")
testify.Regexp(t, getProjectRegx("running"), res.Stdout()) testify.Regexp(t, getProjectRegx("running"), res.Stdout())
}) })