diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-06 15:53:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 15:53:45 +0200 |
| commit | 46e9178ef64ca1e7513251770ccab982eb5f9801 (patch) | |
| tree | 92d711209270617e83db5c2c0d6d98836580c6e2 | |
| parent | 4e06aa37714ecb5b38e189cf85f4aec9b1e6399a (diff) | |
| parent | 04f0ac2aab766e6d778ff336e3d483e09413bd38 (diff) | |
| download | podman-46e9178ef64ca1e7513251770ccab982eb5f9801.tar.gz podman-46e9178ef64ca1e7513251770ccab982eb5f9801.tar.bz2 podman-46e9178ef64ca1e7513251770ccab982eb5f9801.zip | |
Merge pull request #15639 from fj-tsubasa/system-test-proxy
system tests: fix some tests in proxy environment
| -rw-r--r-- | test/system/255-auto-update.bats | 6 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/system/255-auto-update.bats b/test/system/255-auto-update.bats index c6f9600b6..c39d15d0c 100644 --- a/test/system/255-auto-update.bats +++ b/test/system/255-auto-update.bats @@ -375,6 +375,12 @@ After=network-online.target [Service] Type=oneshot ExecStart=/usr/bin/podman auto-update +Environment="http_proxy=${http_proxy}" +Environment="HTTP_PROXY=${HTTP_PROXY}" +Environment="https_proxy=${https_proxy}" +Environment="HTTPS_PROXY=${HTTPS_PROXY}" +Environment="no_proxy=${no_proxy}" +Environment="NO_PROXY=${NO_PROXY}" [Install] WantedBy=default.target diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 5da7523f3..862bc285c 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -61,9 +61,9 @@ load helpers is "$output" "$random_2" "curl 127.0.0.1:/index2.txt" # Verify http contents: wget from a second container - run_podman run --rm --net=host $IMAGE wget -qO - $SERVER/index.txt + run_podman run --rm --net=host --http-proxy=false $IMAGE wget -qO - $SERVER/index.txt is "$output" "$random_1" "podman wget /index.txt" - run_podman run --rm --net=host $IMAGE wget -qO - $SERVER/index2.txt + run_podman run --rm --net=host --http-proxy=false $IMAGE wget -qO - $SERVER/index2.txt is "$output" "$random_2" "podman wget /index2.txt" # Tests #4889 - two-argument form of "podman ports" was broken |