e2e: keeps the http_proxy value

In a proxy environment, http_proxy needs to keep
the value to use a proxy.

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
This commit is contained in:
Toshiki Sonoda
2022-12-07 16:30:32 +09:00
parent 7784f1d165
commit 8b87665f23
2 changed files with 10 additions and 3 deletions

View File

@ -300,6 +300,11 @@ var _ = Describe("Podman build", func() {
})
It("podman build --http_proxy flag", func() {
if env, found := os.LookupEnv("http_proxy"); found {
defer os.Setenv("http_proxy", env)
} else {
defer os.Unsetenv("http_proxy")
}
os.Setenv("http_proxy", "1.2.3.4")
if IsRemote() {
podmanTest.StopRemoteService()
@ -316,7 +321,6 @@ RUN printenv http_proxy`, ALPINE)
session.Wait(120)
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("1.2.3.4"))
os.Unsetenv("http_proxy")
})
It("podman build relay exit code to process", func() {

View File

@ -121,6 +121,11 @@ ENV hello=world
})
It("podman run --http-proxy test", func() {
if env, found := os.LookupEnv("http_proxy"); found {
defer os.Setenv("http_proxy", env)
} else {
defer os.Unsetenv("http_proxy")
}
os.Setenv("http_proxy", "1.2.3.4")
if IsRemote() {
podmanTest.StopRemoteService()
@ -140,12 +145,10 @@ ENV hello=world
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("5.6.7.8"))
os.Unsetenv("http_proxy")
session = podmanTest.Podman([]string{"run", "--http-proxy=false", "--env", "http_proxy=5.6.7.8", ALPINE, "printenv", "http_proxy"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("5.6.7.8"))
os.Unsetenv("http_proxy")
})
})