tests: Also propagate the https proxy

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2014-03-31 21:42:58 -04:00 committed by Serge Hallyn
parent 8afb3e612e
commit 198a3f10d2
2 changed files with 6 additions and 10 deletions

View File

@ -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

View File

@ -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