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

Merge pull request #1187 from docker/fix_aci_flaky_stop 

Better resolution for ACI flakyness on container stop/restart
This commit is contained in:
Guillaume Tardif 2021-01-28 12:23:10 +01:00 committed by GitHub
parent 657e89449a be0a8954fa
commit a96ceac595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
aci/e2e/e2e-aci_test.go
View File

@ -413,7 +413,7 @@ func TestContainerRunAttached(t *testing.T) {
}
return poll.Continue("waiting for container to be running, current inspect result: \n%s", res.Combined())
}
poll.WaitOn(t, checkRunning, poll.WithDelay(5*time.Second), poll.WithTimeout(90*time.Second))
poll.WaitOn(t, checkRunning, poll.WithDelay(5*time.Second), poll.WithTimeout(180*time.Second))
inspectRes := c.RunDockerCmd("inspect", container)
@ -480,11 +480,19 @@ func TestContainerRunAttached(t *testing.T) {
res := c.RunDockerOrExitError("start", container)
//Flaky errors on restart : Code="ContainerGroupTransitioning" Message="The container group 'test-container' is still transitioning, please retry later."
if res.ExitCode != 0 && strings.Contains(res.Stderr(), `Code="ContainerGroupTransitioning"`) {
time.Sleep(3 * time.Second)
res = c.RunDockerCmd("start", container)
res = c.RunDockerOrExitError("rm", "-f", container)
if strings.Contains(res.Stderr(), "unsupported protocol scheme") { // ...
time.Sleep(1 * time.Second)
c.RunDockerCmd("rm", "-f", container)
}
c.RunDockerCmd("run",
"--name", container,
"--memory", "0.1G", "--cpus", "0.1",
"nginx")
} else {
res.Assert(t, icmd.Expected{Out: container})
waitForStatus(t, c, container, convert.StatusRunning)
}
res.Assert(t, icmd.Expected{Out: container})
waitForStatus(t, c, container, convert.StatusRunning)
})
t.Run("prune dry run", func(t *testing.T) {