Merge pull request #16519 from lsm5/v4.3-backports

[v4.3] v4.3 backports
containers · Nov 15, 2022 · 8dfa337 · 8dfa337
2 parents 4b914a6 + fdfee8a
commit 8dfa337
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
@@ -129,13 +129,13 @@ registries = ['{{.Host}}:{{.Port}}']`
 	})
 
 	It("podman search format json list tags", func() {
-		search := podmanTest.Podman([]string{"search", "--list-tags", "--format", "json", "alpine"})
+		search := podmanTest.Podman([]string{"search", "--list-tags", "--format", "json", ALPINE})
 		search.WaitWithDefaultTimeout()
 		Expect(search).Should(Exit(0))
 		Expect(search.OutputToString()).To(BeValidJSON())
-		Expect(search.OutputToString()).To(ContainSubstring("docker.io/library/alpine"))
-		Expect(search.OutputToString()).To(ContainSubstring("3.10"))
-		Expect(search.OutputToString()).To(ContainSubstring("2.7"))
+		Expect(search.OutputToString()).To(ContainSubstring("quay.io/libpod/alpine"))
+		Expect(search.OutputToString()).To(ContainSubstring("3.10.2"))
+		Expect(search.OutputToString()).To(ContainSubstring("3.2"))
 	})
 
 	// Test for https://github.com/containers/podman/issues/11894

diff --git a/test/system/032-sig-proxy.bats b/test/system/032-sig-proxy.bats
@@ -24,7 +24,7 @@ load helpers
 
     # Signal, and wait for container to exit
     kill -INT $kidpid
-    local timeout=5
+    local timeout=10
     while :;do
           sleep 0.5
           run_podman logs foo