containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2e: continuing ExitCleanly() work: manual tweaks 

Commit 2 of 2: the changes needed to get tests to pass

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2023-09-14 13:44:19 -06:00
parent d78221545c
commit e6cf09b68f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/network_create_test.go
View File

@ -523,7 +523,8 @@ var _ = Describe("Podman network create", func() {
nc := podmanTest.Podman([]string{"network", "create", "--internal", net}) nc := podmanTest.Podman([]string{"network", "create", "--internal", net})
nc.WaitWithDefaultTimeout() nc.WaitWithDefaultTimeout()
defer podmanTest.removeNetwork(net) defer podmanTest.removeNetwork(net)
Expect(nc).Should(ExitCleanly()) // Cannot ExitCleanly(): "dnsname and internal networks are incompatible"
Expect(nc).Should(Exit(0))
// Not performing this check on remote tests because it is a logrus error which does // Not performing this check on remote tests because it is a logrus error which does
// not come back via stderr on the remote client. // not come back via stderr on the remote client.
if !IsRemote() { if !IsRemote() {

10
test/e2e/network_test.go
View File

@ -52,7 +52,8 @@ var _ = Describe("Podman network", func() {
session := podmanTest.Podman([]string{"network", "ls", "--filter", "driver=bridge"}) session := podmanTest.Podman([]string{"network", "ls", "--filter", "driver=bridge"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) // Cannot ExitCleanly(): "stat ~/.config/.../*.conflist: ENOENT"
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring(name)) Expect(session.OutputToString()).To(ContainSubstring(name))
}) })
@ -494,12 +495,12 @@ var _ = Describe("Podman network", func() {
// Nginx is now running so no need to do a loop // Nginx is now running so no need to do a loop
// Test against the first alias // Test against the first alias
c2 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, NGINX_IMAGE, "curl", "web1"}) c2 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, NGINX_IMAGE, "curl", "-s", "web1"})
c2.WaitWithDefaultTimeout() c2.WaitWithDefaultTimeout()
Expect(c2).Should(ExitCleanly()) Expect(c2).Should(ExitCleanly())
// Test against the second alias // Test against the second alias
c3 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, NGINX_IMAGE, "curl", "web2"}) c3 := podmanTest.Podman([]string{"run", "--dns-search", "dns.podman", "--network=" + netName, NGINX_IMAGE, "curl", "-s", "web2"})
c3.WaitWithDefaultTimeout() c3.WaitWithDefaultTimeout()
Expect(c3).Should(ExitCleanly()) Expect(c3).Should(ExitCleanly())
}) })
@ -511,7 +512,8 @@ var _ = Describe("Podman network", func() {
nc := podmanTest.Podman([]string{"network", "create", "--macvlan", "lo", net}) nc := podmanTest.Podman([]string{"network", "create", "--macvlan", "lo", net})
nc.WaitWithDefaultTimeout() nc.WaitWithDefaultTimeout()
defer podmanTest.removeNetwork(net) defer podmanTest.removeNetwork(net)
Expect(nc).Should(ExitCleanly()) // Cannot ExitCleanly(): "The --macvlan option is deprecated..."
Expect(nc).Should(Exit(0))
nc = podmanTest.Podman([]string{"network", "rm", net}) nc = podmanTest.Podman([]string{"network", "rm", net})
nc.WaitWithDefaultTimeout() nc.WaitWithDefaultTimeout()