Merge pull request containers#15639 from fj-tsubasa/system-test-proxy

system tests: fix some tests in proxy environment
giuseppe · Sep 6, 2022 · 46e9178 · 46e9178
2 parents 4e06aa3 + 04f0ac2
commit 46e9178
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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