diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-07 13:02:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 13:02:02 -0400 |
| commit | ce93ab354234c989c52bdbf87166e117e7c97fce (patch) | |
| tree | 5cd6445f92921c7015fbe0b9663983165bd58db3 /test/e2e/run_env_test.go | |
| parent | a7500e54a4646c7db477349e2530ac13df77b8fa (diff) | |
| parent | ccc5bc167fa2c140e33963bb5cce99f40ff00281 (diff) | |
| download | podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.gz podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.bz2 podman-ce93ab354234c989c52bdbf87166e117e7c97fce.zip | |
Merge pull request #7845 from rhatdan/remote
Attempt to turn on some more remote tests
Diffstat (limited to 'test/e2e/run_env_test.go')
| -rw-r--r-- | test/e2e/run_env_test.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index 3f488ada5..9882b936a 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -90,11 +90,15 @@ var _ = Describe("Podman run", func() { }) It("podman run --env-host environment test", func() { - SkipIfRemote("FIXME, We should check that --env-host reports correct error on podman-remote") env := append(os.Environ(), "FOO=BAR") session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env) - session.WaitWithDefaultTimeout() + if IsRemote() { + // podman-remote does not support --env-host + Expect(session.ExitCode()).To(Equal(125)) + Expect(session.ErrorToString()).To(ContainSubstring("unknown flag: --env-host")) + return + } Expect(session.ExitCode()).To(Equal(0)) match, _ := session.GrepString("BAR") Expect(match).Should(BeTrue()) @@ -108,8 +112,11 @@ var _ = Describe("Podman run", func() { }) It("podman run --http-proxy test", func() { - SkipIfRemote("FIXME: Should report proper error when http-proxy is not supported") os.Setenv("http_proxy", "1.2.3.4") + if IsRemote() { + podmanTest.StopRemoteService() + podmanTest.StartRemoteService() + } session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |