summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-28 01:26:47 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-28 01:27:14 +0100
commitc4fced1935117844166b3e7f7067a0392ac137b6 (patch)
treefbda39ae901236b865d7d920db7e54b767bb0846 /bin
parenteb3d5cf244b122cdab7e412c718470adb8ed776c (diff)
downloadjenkins.debian.net-c4fced1935117844166b3e7f7067a0392ac137b6.tar.xz
torbrowser tests: install ca-certificates by setup job again, as long as #805173 is still open in any suite
Diffstat (limited to 'bin')
-rwxr-xr-xbin/test_torbrowser-launcher.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 85a56564..a6086b5a 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -149,12 +149,10 @@ announce_problem_and_abort_silently() {
}
prepare_other_packages() {
+ # once #805173 is fixed in all tested suites, ca-certificates doesn't have to be installed here anymore
if $VIA_TOR ; then
- echo "$(date -u ) - installing ca-certificates as this test will download torbrowser via the system tor service."
+ echo "$(date -u ) - installing tor as this test will download torbrowser via the system tor service."
schroot --run-session -c $SESSION --directory $TMPDIR -u root -- apt-get install -y tor
- else
- echo "$(date -u ) - installing ca-certificates as this test will download torbrowser via https."
- schroot --run-session -c $SESSION --directory $TMPDIR -u root -- apt-get install -y ca-certificates
fi
}
@@ -246,12 +244,13 @@ download_and_launch() {
export PYTHONUNBUFFERED=true
prepare_lauchner_settings
( timeout -k 30m 29m schroot --run-session -c $SESSION --preserve-environment -- /usr/bin/torbrowser-launcher --settings 2>&1 |& tee $TBL_LOGFILE || true ) &
- sleep 20
+ sleep 23
update_screenshot
if $VIA_TOR ; then
# download via system tor
echo "$(date -u) - pressing <return> to select download via tor"
xvkbd -text "\r" > /dev/null 2>&1
+ sleep 1
update_screenshot
fi
# else the default will be used, which is download via https…