diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-05-06 13:20:44 +0200 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-07 14:16:50 -0400 |
| commit | 99bdafba999078bb5763c65cf7dfe7df520030f7 (patch) | |
| tree | 916c768fca45b5e809f9e941b5425e760dcfe08c /test/e2e | |
| parent | 1d3cdf9a4642df073becb54d178d6b1959526a47 (diff) | |
| download | podman-99bdafba999078bb5763c65cf7dfe7df520030f7.tar.gz podman-99bdafba999078bb5763c65cf7dfe7df520030f7.tar.bz2 podman-99bdafba999078bb5763c65cf7dfe7df520030f7.zip | |
podman: split env variables in env and overrides
There are three different priorities for applying env variables:
1) environment/config file environment variables
2) image's config
3) user overrides (--env)
The third kind are known to the client, while the default config and image's
config is handled by the backend.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/build_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/run_env_test.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 76651283a..9e41fd231 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -177,7 +177,6 @@ var _ = Describe("Podman build", func() { }) It("podman Test PATH in built image", func() { - Skip(v2fail) // Run error - we don't set data from the image (i.e., PATH) yet path := "/tmp:/bin:/usr/bin:/usr/sbin" session := podmanTest.PodmanNoCache([]string{ "build", "-f", "build/basicalpine/Containerfile.path", "-t", "test-path", diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index 867913a08..2adf21171 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -91,7 +91,8 @@ var _ = Describe("Podman run", func() { Expect(match).Should(BeTrue()) }) - It("podman run --host-env environment test", func() { + It("podman run --env-host environment test", func() { + SkipIfRemote() env := append(os.Environ(), "FOO=BAR") session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env) @@ -109,6 +110,7 @@ var _ = Describe("Podman run", func() { }) It("podman run --http-proxy test", func() { + SkipIfRemote() os.Setenv("http_proxy", "1.2.3.4") session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"}) session.WaitWithDefaultTimeout() |