Merge pull request #18816 from edsantiago/ginkgo_decorators

e2e: add ginkgo decorators to address flakes
containers · Jun 7, 2023 · 384e937 · 384e937
2 parents 82caa10 + b65ba90
commit 384e937
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
@@ -308,7 +308,8 @@ var _ = Describe("Podman exec", func() {
 		Expect(session.OutputToString()).To(ContainSubstring("0000000000000000"))
 	})
 
-	It("podman exec terminal doesn't hang", func() {
+	// #10927 ("no logs from conmon"), one of our nastiest flakes
+	It("podman exec terminal doesn't hang", FlakeAttempts(3), func() {
 		setup := podmanTest.Podman([]string{"run", "-dti", "--name", "test1", fedoraMinimal, "sleep", "+Inf"})
 		setup.WaitWithDefaultTimeout()
 		Expect(setup).Should(Exit(0))

diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
@@ -433,7 +433,8 @@ registries = ['{{.Host}}:{{.Port}}']`
 		Expect(search).To(ExitWithError())
 	})
 
-	It("podman search with wildcards", func() {
+	// Registry is unreliable (#18484), this is another super-common flake
+	It("podman search with wildcards", FlakeAttempts(3), func() {
 		search := podmanTest.Podman([]string{"search", "registry.access.redhat.com/*openshift*"})
 		search.WaitWithDefaultTimeout()
 		Expect(search).Should(Exit(0))

diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go
@@ -11,7 +11,8 @@ import (
 	. "github.com/onsi/gomega/gexec"
 )
 
-var _ = Describe("Podman trust", func() {
+// Without Ordered, tests flake with "Getting key identity" (#18358)
+var _ = Describe("Podman trust", Ordered, func() {
 
 	BeforeEach(func() {
 		SkipIfRemote("podman-remote does not support image trust")