tests: Also propagate the https proxy

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 01ae8282fd2c1b9e4baf97521dfea9e4f01a7bff..bbe1e08cf70d77c1e14915a6c1fbe27682844b4b 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -51,11 +51,9 @@ cleanup() {
 }
 
 run_cmd() {
-       if [ -n "${http_proxy:-}" ]; then
-               sudo -i -u $TUSER env http_proxy=$http_proxy XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
-       else
-               sudo -i -u $TUSER env XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
-       fi
+       sudo -i -u $TUSER \
+           env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
+               XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
 }
 
 # create a test user

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 61535080ce78aeb97a7bf18ffbf8702d4847c8bd..93af62303748425d4a109b31ec150dfd466b0747 100755 (executable)
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -57,11 +57,9 @@ cleanup() {
 }
 
 run_cmd() {
-       if [ -n "${http_proxy:-}" ]; then
-               sudo -i -u usernic-user env http_proxy=$http_proxy XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
-       else
-               sudo -i -u usernic-user env XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
-       fi
+       sudo -i -u usernic-user \
+           env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
+               XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
 }
 
 ARCH=i386