tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1125 from gtardif/flaky_compose_run

Browse Source 
Move check that container exited after inspecting container
This commit is contained in:
Nicolas De loof 2021-01-13 10:09:07 +01:00 committed by GitHub
commit 240e62caed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/compose-e2e/compose_test.go
View File

@ -126,7 +126,6 @@ func TestLocalComposeRun(t *testing.T) {
assert.Assert(t, strings.HasPrefix(containerID, "run-test_back_run_"), containerID) assert.Assert(t, strings.HasPrefix(containerID, "run-test_back_run_"), containerID)
truncatedSlug = strings.Replace(containerID, "run-test_back_run_", "", 1) truncatedSlug = strings.Replace(containerID, "run-test_back_run_", "", 1)
runContainerID = containerID runContainerID = containerID
assert.Assert(t, strings.Contains(line, "Exited"), line)
} }
if strings.HasPrefix(containerID, "run-test_db_1") { if strings.HasPrefix(containerID, "run-test_db_1") {
assert.Assert(t, strings.Contains(line, "Up"), line) assert.Assert(t, strings.Contains(line, "Up"), line)
@ -134,6 +133,7 @@ func TestLocalComposeRun(t *testing.T) {
} }
assert.Assert(t, runContainerID != "") assert.Assert(t, runContainerID != "")
res = c.RunDockerCmd("inspect", runContainerID) res = c.RunDockerCmd("inspect", runContainerID)
res.Assert(t, icmd.Expected{Out: ` "Status": "exited"`})
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.container-number": "1"`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.container-number": "1"`})
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project": "run-test"`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project": "run-test"`})
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.oneoff": "True",`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.oneoff": "True",`})