Merge pull request containers#9385 from baude/fixci

Fixci
Luap99 · Feb 16, 2021 · df8ba7f · df8ba7f
2 parents 30607d7 + 227c548
commit df8ba7f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
@@ -194,7 +194,7 @@ WORKDIR /test
 		result := podmanTest.Podman([]string{"images", "-q", "-f", "since=quay.io/libpod/alpine:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result).Should(Exit(0))
-		Expect(len(result.OutputToStringArray())).To(Equal(7))
+		Expect(len(result.OutputToStringArray())).To(Equal(8))
 	})
 
 	It("podman image list filter after image", func() {
@@ -204,7 +204,7 @@ WORKDIR /test
 		result := podmanTest.Podman([]string{"image", "list", "-q", "-f", "after=quay.io/libpod/alpine:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result).Should(Exit(0))
-		Expect(result.OutputToStringArray()).Should(HaveLen(7), "list filter output: %q", result.OutputToString())
+		Expect(result.OutputToStringArray()).Should(HaveLen(8), "list filter output: %q", result.OutputToString())
 	})
 
 	It("podman images filter dangling", func() {

diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
@@ -407,6 +407,7 @@ var _ = Describe("Podman network", func() {
 		Expect(lines[0]).To(Equal(netName1))
 		Expect(lines[1]).To(Equal(netName2))
 	})
+
 	It("podman network with multiple aliases", func() {
 		var worked bool
 		netName := "aliasTest" + stringid.GenerateNonCryptoID()
@@ -415,16 +416,28 @@ var _ = Describe("Podman network", func() {
 		defer podmanTest.removeCNINetwork(netName)
 		Expect(session.ExitCode()).To(BeZero())
 
+		interval := time.Duration(250 * time.Millisecond)
+		for i := 0; i < 6; i++ {
+			n := podmanTest.Podman([]string{"network", "exists", netName})
+			n.WaitWithDefaultTimeout()
+			worked = n.ExitCode() == 0
+			if worked {
+				break
+			}
+			time.Sleep(interval)
+			interval *= 2
+		}
+
 		top := podmanTest.Podman([]string{"run", "-dt", "--name=web", "--network=" + netName, "--network-alias=web1", "--network-alias=web2", nginx})
 		top.WaitWithDefaultTimeout()
 		Expect(top.ExitCode()).To(BeZero())
-		interval := time.Duration(250 * time.Millisecond)
+		interval = time.Duration(250 * time.Millisecond)
 		// Wait for the nginx service to be running
 		for i := 0; i < 6; i++ {
 			// Test curl against the container's name
-			c1 := podmanTest.Podman([]string{"run", "--network=" + netName, nginx, "curl", "web"})
+			c1 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, nginx, "curl", "web"})
 			c1.WaitWithDefaultTimeout()
-			worked = Expect(c1.ExitCode()).To(BeZero())
+			worked = c1.ExitCode() == 0
 			if worked {
 				break
 			}
@@ -435,12 +448,12 @@ var _ = Describe("Podman network", func() {
 
 		// Nginx is now running so no need to do a loop
 		// Test against the first alias
-		c2 := podmanTest.Podman([]string{"run", "--network=" + netName, nginx, "curl", "web1"})
+		c2 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, nginx, "curl", "web1"})
 		c2.WaitWithDefaultTimeout()
 		Expect(c2.ExitCode()).To(BeZero())
 
 		// Test against the second alias
-		c3 := podmanTest.Podman([]string{"run", "--network=" + netName, nginx, "curl", "web2"})
+		c3 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, nginx, "curl", "web2"})
 		c3.WaitWithDefaultTimeout()
 		Expect(c3.ExitCode()).To(BeZero())
 	})