diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-09 15:49:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-09 15:49:21 -0400 |
commit | e7db6d4893fe4c583dc492f4870a16085f3c9f70 (patch) | |
tree | 615e9078760ce3b0b7a2ad382ca5e1b2c266a377 /test/e2e | |
parent | 0405e7c161dab4cfc9fdc846b83ca585156e25a1 (diff) | |
parent | b13fc1bf983860d0627155ddbbbf28bf09e29a9e (diff) | |
download | podman-e7db6d4893fe4c583dc492f4870a16085f3c9f70.tar.gz podman-e7db6d4893fe4c583dc492f4870a16085f3c9f70.tar.bz2 podman-e7db6d4893fe4c583dc492f4870a16085f3c9f70.zip |
Merge pull request #14480 from cdoern/infra
patch for pod host networking & other host namespace handling
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/pod_infra_container_test.go | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index ad2db2411..20794a29c 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -130,14 +130,24 @@ var _ = Describe("Podman pod create", func() { session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - session = podmanTest.Podman([]string{"run", "-dt", "--pod", session.OutputToString(), ALPINE}) + session = podmanTest.Podman([]string{"run", "--name", "hostCtr", "--pod", session.OutputToString(), ALPINE, "readlink", "/proc/self/ns/net"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - session = podmanTest.Podman([]string{"inspect", "--format", "'{{.NetworkSettings.SandboxKey}}'", session.OutputToString()}) + ns := SystemExec("readlink", []string{"/proc/self/ns/net"}) + ns.WaitWithDefaultTimeout() + Expect(ns).Should(Exit(0)) + netns := ns.OutputToString() + Expect(netns).ToNot(BeEmpty()) + + Expect(session.OutputToString()).To(Equal(netns)) + + // Sanity Check for podman inspect + session = podmanTest.Podman([]string{"inspect", "--format", "'{{.NetworkSettings.SandboxKey}}'", "hostCtr"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.OutputToString()).Should(ContainSubstring("''")) // no network path... host + Expect(session.OutputToString()).Should(Equal("''")) // no network path... host + }) It("podman pod correctly sets up IPCNS", func() { |