Skip to content

L
lxc
Commit b22b3e12 by Stéphane Graber
Options

tests: Also propagate the https proxy

Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 20cfa342
Showing with 6 additions and 10 deletions
src/tests/lxc-test-unpriv
...@@ -51,11 +51,9 @@ cleanup() { ...@@ -51,11 +51,9 @@ cleanup() {
} }
run_cmd() { run_cmd() {
if [ -n "${http_proxy:-}" ]; then sudo -i -u $TUSER \
sudo -i -u $TUSER env http_proxy=$http_proxy XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $* env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
else XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
sudo -i -u $TUSER env XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
fi
} }
# create a test user # create a test user
......
src/tests/lxc-test-usernic.in
...@@ -57,11 +57,9 @@ cleanup() { ...@@ -57,11 +57,9 @@ cleanup() {
} }
run_cmd() { run_cmd() {
if [ -n "${http_proxy:-}" ]; then sudo -i -u usernic-user \
sudo -i -u usernic-user env http_proxy=$http_proxy XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $* env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
else XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
sudo -i -u usernic-user env XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
fi
} }
ARCH=i386 ARCH=i386
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment