From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 6 Feb 2014 22:35:55 +0000 (-0500)
Subject: tests: Pass http_proxy through sudo environment
X-Git-Tag: lxc-1.0.0.beta4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6ccd90bb2b693cf3a77f2d50648b98d3400f5c3;p=thirdparty%2Flxc.git

tests: Pass http_proxy through sudo environment

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

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 1e75eeaac..d9a5c5c57 100755
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -49,7 +49,11 @@ cleanup() {
 }
 
 run_cmd() {
-	sudo -i -u $TUSER env XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
+	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
 }
 
 # create a test user
diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index eb0f30e5e..846e592b1 100755
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -55,7 +55,11 @@ cleanup() {
 }
 
 run_cmd() {
-	sudo -i -u usernic-user env XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
+	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
 }
 
 set -eu