Merge pull request #1037 from gtardif/fix_aci_flakyness

Trying to fix ACI flakyness on docker prune --force
This commit is contained in:
Nicolas De loof 2020-12-10 10:08:34 +01:00 committed by GitHub
commit 50d434078d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -485,7 +485,11 @@ func TestContainerRunAttached(t *testing.T) {
t.Run("prune dry run", func(t *testing.T) {
res := c.RunDockerCmd("prune", "--dry-run")
assert.Equal(t, "Resources that would be deleted:\nTotal CPUs reclaimed: 0.00, total memory reclaimed: 0.00 GB\n", res.Stdout())
res = c.RunDockerOrExitError("prune", "--dry-run", "--force")
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", "--dry-run", "--force")
}
assert.Equal(t, "Resources that would be deleted:\n"+container+"\nTotal CPUs reclaimed: 0.10, total memory reclaimed: 0.10 GB\n", res.Stdout())
})