소스 검색

Merge pull request #1037 from gtardif/fix_aci_flakyness

Trying to fix ACI flakyness on docker prune --force
Nicolas De loof 4 년 전
부모
커밋
50d434078d
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      tests/aci-e2e/e2e-aci_test.go

+ 5 - 1
tests/aci-e2e/e2e-aci_test.go

@@ -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.RunDockerCmd("prune", "--dry-run", "--force")
+		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())
 	})