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

Merge pull request #1105 from docker/flaky_aci

Browse Source 
Improving ACI E2E tests with platform flakyness
This commit is contained in:
Guillaume Tardif 2021-01-06 14:28:03 +01:00 committed by GitHub
commit 6e8975db79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -11,6 +11,7 @@ or Microsoft Azure Container Instances
using the Docker commands you already know.
To get started, all you need is:
* An [AWS](https://aws.amazon.com) or [Azure](https://azure.microsoft.com)
account
* Windows: The Stable or Edge release of

12
tests/aci-e2e/e2e-aci_test.go
View File

@ -478,6 +478,11 @@ func TestContainerRunAttached(t *testing.T) {
t.Run("restart container", func(t *testing.T) {
res := c.RunDockerCmd("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.Assert(t, icmd.Expected{Out: container})
waitForStatus(t, c, container, convert.StatusRunning)
})
@ -504,10 +509,13 @@ func TestContainerRunAttached(t *testing.T) {
if strings.Contains(res.Stderr(), "unsupported protocol scheme") { //Flaky strange error on azure SDK call happening only during prune --force
time.Sleep(1 * time.Second)
res = c.RunDockerCmd("prune", "--force")
// After the retry, it seems prune has sometimes actually been executed, and we get zero thigs to delete again...
assert.Assert(t, res.Stdout() == "Deleted resources:\n"+container+"\nTotal CPUs reclaimed: 0.10, total memory reclaimed: 0.10 GB\n" ||
res.Stdout() == "Deleted resources:\nTotal CPUs reclaimed: 0.00, total memory reclaimed: 0.00 GB\n", res.Stdout())
} else {
assert.Equal(t, "Deleted resources:\n"+container+"\nTotal CPUs reclaimed: 0.10, total memory reclaimed: 0.10 GB\n", res.Stdout())
}
assert.Equal(t, "Deleted resources:\n"+container+"\nTotal CPUs reclaimed: 0.10, total memory reclaimed: 0.10 GB\n", res.Stdout())
res = c.RunDockerCmd("ps", "--all")
l = Lines(res.Stdout())
assert.Equal(t, 1, len(l))