summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-15 15:38:33 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-15 15:38:33 +0100
commitb490e55a68f940a0cc50a7e89930b4bea72df989 (patch)
treeb02032824e67e58d68005970cb4440e286398a74 /bin
parent51798a2a3ea8c4c1c0eafae0a7a7ecde7c2ece3b (diff)
downloadjenkins.debian.net-b490e55a68f940a0cc50a7e89930b4bea72df989.tar.xz
torbrowser tests: use awesome too, clear proxy variables
Diffstat (limited to 'bin')
-rwxr-xr-xbin/test_torbrowser-launcher.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index d0322582..4a7e1d07 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -42,7 +42,9 @@ first_test() {
Xvfb -ac -br -screen 0 1024x768x16 :$SCREEN &
XPID=$!
export DISPLAY=":$SCREEN.0"
- export
+ unset http_proxy
+ unset https_proxy
+ timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- awesome &
timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- torbrowser-launcher https://www.debian.org &
ffmpeg -f x11grab -i :$SCREEN.0 test-torbrowser-$SUITE.mpg > /dev/null 2>&1 &
FFMPEGPID=$!