Quellcode durchsuchen

Fixed assertion after retry due to ACI flakyness on prune

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif vor 4 Jahren
Ursprung
Commit
2f4a84baff
2 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
  1. 1 0
      README.md
  2. 5 2
      tests/aci-e2e/e2e-aci_test.go

+ 1 - 0
README.md

@@ -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

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

@@ -504,10 +504,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))