opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7593 from edsantiago/network_test_cleanup

Browse Source 
run_networking e2e test: add cleanup to some tests
This commit is contained in:
OpenShift Merge Robot
2020-09-11 05:53:19 -04:00
committed by GitHub
parent 2a637948e7 6874038e6a
commit e59c3ce1c5
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/run_networking_test.go
View File

@ -535,15 +535,12 @@ var _ = Describe("Podman run networking", func() {
create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.30.0/24", netName}) create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.30.0/24", netName})
create.WaitWithDefaultTimeout() create.WaitWithDefaultTimeout()
Expect(create.ExitCode()).To(BeZero()) Expect(create.ExitCode()).To(BeZero())
defer podmanTest.removeCNINetwork(netName)
run := podmanTest.Podman([]string{"run", "-t", "-i", "--rm", "--net", netName, "--ip", ipAddr, ALPINE, "ip", "addr"}) run := podmanTest.Podman([]string{"run", "-t", "-i", "--rm", "--net", netName, "--ip", ipAddr, ALPINE, "ip", "addr"})
run.WaitWithDefaultTimeout() run.WaitWithDefaultTimeout()
Expect(run.ExitCode()).To(BeZero()) Expect(run.ExitCode()).To(BeZero())
Expect(run.OutputToString()).To(ContainSubstring(ipAddr)) Expect(run.OutputToString()).To(ContainSubstring(ipAddr))
netrm := podmanTest.Podman([]string{"network", "rm", netName})
netrm.WaitWithDefaultTimeout()
Expect(netrm.ExitCode()).To(BeZero())
}) })
It("podman run with new:pod and static-ip", func() { It("podman run with new:pod and static-ip", func() {
@ -555,6 +552,7 @@ var _ = Describe("Podman run networking", func() {
create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.40.0/24", netName}) create := podmanTest.Podman([]string{"network", "create", "--subnet", "10.25.40.0/24", netName})
create.WaitWithDefaultTimeout() create.WaitWithDefaultTimeout()
Expect(create.ExitCode()).To(BeZero()) Expect(create.ExitCode()).To(BeZero())
defer podmanTest.removeCNINetwork(netName)
run := podmanTest.Podman([]string{"run", "-t", "-i", "--rm", "--pod", "new:" + podname, "--net", netName, "--ip", ipAddr, ALPINE, "ip", "addr"}) run := podmanTest.Podman([]string{"run", "-t", "-i", "--rm", "--pod", "new:" + podname, "--net", netName, "--ip", ipAddr, ALPINE, "ip", "addr"})
run.WaitWithDefaultTimeout() run.WaitWithDefaultTimeout()
@ -564,9 +562,5 @@ var _ = Describe("Podman run networking", func() {
podrm := podmanTest.Podman([]string{"pod", "rm", "-f", podname}) podrm := podmanTest.Podman([]string{"pod", "rm", "-f", podname})
podrm.WaitWithDefaultTimeout() podrm.WaitWithDefaultTimeout()
Expect(podrm.ExitCode()).To(BeZero()) Expect(podrm.ExitCode()).To(BeZero())
netrm := podmanTest.Podman([]string{"network", "rm", netName})
netrm.WaitWithDefaultTimeout()
Expect(netrm.ExitCode()).To(BeZero())
}) })
}) })