opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2e tests: try to deflake 5000

Browse Source 
We keep getting flakes in tests that use port 5000. Try to
find and fix, by switching ports where possible, and locking
5000 when not possible (or not easy) to switch.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2022-08-29 12:23:08 -06:00
parent 468aa6478c
commit a240146a2d
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/generate_kube_test.go
View File

@ -550,6 +550,11 @@ var _ = Describe("Podman generate kube", func() {
It("podman generate kube on pod with ports", func() { It("podman generate kube on pod with ports", func() {
podName := "test" podName := "test"
lock4 := GetPortLock("4000")
defer lock4.Unlock()
lock5 := GetPortLock("5000")
defer lock5.Unlock()
podSession := podmanTest.Podman([]string{"pod", "create", "--name", podName, "-p", "4000:4000", "-p", "5000:5000"}) podSession := podmanTest.Podman([]string{"pod", "create", "--name", podName, "-p", "4000:4000", "-p", "5000:5000"})
podSession.WaitWithDefaultTimeout() podSession.WaitWithDefaultTimeout()
Expect(podSession).Should(Exit(0)) Expect(podSession).Should(Exit(0))

4
test/e2e/play_kube_test.go
View File

@ -2482,7 +2482,7 @@ spec:
It("podman play kube test with network portbindings", func() { It("podman play kube test with network portbindings", func() {
ip := "127.0.0.100" ip := "127.0.0.100"
port := "5000" port := "8087"
ctr := getCtr(withHostIP(ip, port), withImage(BB)) ctr := getCtr(withHostIP(ip, port), withImage(BB))
pod := getPod(withCtr(ctr)) pod := getPod(withCtr(ctr))
@ -2496,7 +2496,7 @@ spec:
inspect := podmanTest.Podman([]string{"port", getCtrNameInPod(pod)}) inspect := podmanTest.Podman([]string{"port", getCtrNameInPod(pod)})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
Expect(inspect.OutputToString()).To(Equal("5000/tcp -> 127.0.0.100:5000")) Expect(inspect.OutputToString()).To(Equal("8087/tcp -> 127.0.0.100:8087"))
}) })
It("podman play kube test with nonexistent empty HostPath type volume", func() { It("podman play kube test with nonexistent empty HostPath type volume", func() {

3
test/e2e/save_test.go
View File

@ -153,6 +153,9 @@ var _ = Describe("Podman save", func() {
defer os.Setenv("GNUPGHOME", origGNUPGHOME) defer os.Setenv("GNUPGHOME", origGNUPGHOME)
port := 5000 port := 5000
portlock := GetPortLock(strconv.Itoa(port))
defer portlock.Unlock()
session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", strings.Join([]string{strconv.Itoa(port), strconv.Itoa(port)}, ":"), REGISTRY_IMAGE}) session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", strings.Join([]string{strconv.Itoa(port), strconv.Itoa(port)}, ":"), REGISTRY_IMAGE})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))