diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-12 15:59:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 15:59:46 -0400 |
| commit | d6507fcfbce90b06a2b611a4cddadc3f64d51a4e (patch) | |
| tree | 98d2001ec68f032e8132bc55f960ef71cc712ec3 /test/e2e/run_networking_test.go | |
| parent | d8dc56ba6758e590d14fca0c733246454837faf9 (diff) | |
| parent | d32863bbb4a2c2e8592766d84e16140fa71dcaa3 (diff) | |
| download | podman-d6507fcfbce90b06a2b611a4cddadc3f64d51a4e.tar.gz podman-d6507fcfbce90b06a2b611a4cddadc3f64d51a4e.tar.bz2 podman-d6507fcfbce90b06a2b611a4cddadc3f64d51a4e.zip | |
Merge pull request #10222 from vrothberg/image-tree
podman image tree: restore previous behavior
Diffstat (limited to 'test/e2e/run_networking_test.go')
| -rw-r--r-- | test/e2e/run_networking_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 4c66e2823..37e837b1d 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -649,11 +649,13 @@ var _ = Describe("Podman run networking", func() { defer podmanTest.removeCNINetwork(netName) name := "nc-server" - run := podmanTest.Podman([]string{"run", "-d", "--name", name, "--net", netName, ALPINE, "nc", "-l", "-p", "8080"}) + run := podmanTest.Podman([]string{"run", "--log-driver", "k8s-file", "-d", "--name", name, "--net", netName, ALPINE, "nc", "-l", "-p", "8080"}) run.WaitWithDefaultTimeout() Expect(run.ExitCode()).To(Equal(0)) - run = podmanTest.Podman([]string{"run", "--rm", "--net", netName, "--uidmap", "0:1:4096", ALPINE, "sh", "-c", fmt.Sprintf("echo podman | nc -w 1 %s.dns.podman 8080", name)}) + // NOTE: we force the k8s-file log driver to make sure the + // tests are passing inside a container. + run = podmanTest.Podman([]string{"run", "--log-driver", "k8s-file", "--rm", "--net", netName, "--uidmap", "0:1:4096", ALPINE, "sh", "-c", fmt.Sprintf("echo podman | nc -w 1 %s.dns.podman 8080", name)}) run.WaitWithDefaultTimeout() Expect(run.ExitCode()).To(Equal(0)) |