diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-24 17:46:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 17:46:20 +0200 |
| commit | 3c3adac52838bc4d2b0fdda2cbb8366c81444728 (patch) | |
| tree | e8f2c7807a36403a1ffef16a8147a1448e4a2221 /test | |
| parent | dcb99f5315eea27f9cc8720937ae2f5c272a6a00 (diff) | |
| parent | 3eeb03d1f970478961acf21cecfdf90d5a75043f (diff) | |
| download | podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.tar.gz podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.tar.bz2 podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.zip | |
Merge pull request #5967 from giuseppe/run-test-fixes
v2, tests: fix various run_test.go failures
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_test.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index c84bbe91f..7d4039819 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -29,7 +29,6 @@ var _ = Describe("Podman run", func() { ) BeforeEach(func() { - Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) @@ -252,14 +251,15 @@ var _ = Describe("Podman run", func() { }) It("podman run --host-env environment test", func() { - os.Setenv("FOO", "BAR") - session := podmanTest.Podman([]string{"run", "--rm", "--env-host", ALPINE, "printenv", "FOO"}) + env := append(os.Environ(), "FOO=BAR") + session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env) + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) match, _ := session.GrepString("BAR") Expect(match).Should(BeTrue()) - session = podmanTest.Podman([]string{"run", "--rm", "--env", "FOO=BAR1", "--env-host", ALPINE, "printenv", "FOO"}) + session = podmanTest.PodmanAsUser([]string{"run", "--rm", "--env", "FOO=BAR1", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) match, _ = session.GrepString("BAR1") @@ -708,6 +708,7 @@ USER mail` }) It("podman run --volumes-from flag with built-in volumes", func() { + Skip(v2fail) session := podmanTest.Podman([]string{"create", redis, "sh"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -802,6 +803,7 @@ USER mail` }) It("podman run --pod automatically", func() { + Skip(v2fail) session := podmanTest.Podman([]string{"run", "--pod", "new:foobar", ALPINE, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |