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/create_staticip_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/create_staticip_test.go')
| -rw-r--r-- | test/e2e/create_staticip_test.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index 340ea31f3..2cf552274 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -60,8 +60,10 @@ var _ = Describe("Podman create with --ip flag", func() { }) It("Podman create with specified static IP has correct IP", func() { + // NOTE: we force the k8s-file log driver to make sure the + // tests are passing inside a container. ip := GetRandomIPAddress() - result := podmanTest.Podman([]string{"create", "--name", "test", "--ip", ip, ALPINE, "ip", "addr"}) + result := podmanTest.Podman([]string{"create", "--log-driver", "k8s-file", "--name", "test", "--ip", ip, ALPINE, "ip", "addr"}) result.WaitWithDefaultTimeout() // Rootless static ip assignment without network should error if rootless.IsRootless() { @@ -83,10 +85,10 @@ var _ = Describe("Podman create with --ip flag", func() { It("Podman create two containers with the same IP", func() { SkipIfRootless("--ip not supported without network in rootless mode") ip := GetRandomIPAddress() - result := podmanTest.Podman([]string{"create", "--name", "test1", "--ip", ip, ALPINE, "sleep", "999"}) + result := podmanTest.Podman([]string{"create", "--log-driver", "k8s-file", "--name", "test1", "--ip", ip, ALPINE, "sleep", "999"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) - result = podmanTest.Podman([]string{"create", "--name", "test2", "--ip", ip, ALPINE, "ip", "addr"}) + result = podmanTest.Podman([]string{"create", "--log-driver", "k8s-file", "--name", "test2", "--ip", ip, ALPINE, "ip", "addr"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) result = podmanTest.Podman([]string{"start", "test1"}) |