[lxc-devel] [PATCH] tests: Also propagate the https proxy

[Stéphane Graber]

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 src/tests/lxc-test-unpriv     | 8 +++-----
 src/tests/lxc-test-usernic.in | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 01ae828..bbe1e08 100755
--- 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 6153508..93af623 100755
--- 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
-- 
1.9.1