summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-25 19:58:45 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-25 19:58:45 +0100
commit5e9c47c7b2fa7328696f416b5aa1893fdf8a85ad (patch)
tree4d649dbf5f90d925402f4181bc857c93b31d2f85
parent94acffdc54f4748be09a110c5f4c7551a08a5907 (diff)
downloadjenkins.debian.net-5e9c47c7b2fa7328696f416b5aa1893fdf8a85ad.tar.xz
torbrowser tests: better documentation of download via tor
-rwxr-xr-xbin/test_torbrowser-launcher.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index c9eebc20..455bf435 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -150,8 +150,10 @@ announce_problem_and_abort_silently() {
prepare_other_packages() {
if $VIA_TOR ; then
+ 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
}
@@ -247,10 +249,11 @@ download_and_launch() {
sleep 20
update_screenshot
if $VIA_TOR ; then
- # download via tor
+ # download via system tor
echo "$(date -u) - pressing <space>"
xvkbd -text "\[space]" > /dev/null 2>&1
fi
+ # else the default will be used, which is download via https…
echo "$(date -u) - pressing <tab>"
xvkbd -text "\t" > /dev/null 2>&1
sleep 1