summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-03-01 11:57:42 +0100
committerHolger Levsen <holger@layer-acht.org>2016-03-01 11:57:42 +0100
commit8d423bd1f6b00938f98d559d4fb80a9c442ed531 (patch)
treeb52f3ebd3c5e7c1ab194e39081d0ef2d61e1705b
parent6a20ebfe84f1849c21262d77247a87b590bd961a (diff)
downloadjenkins.debian.net-8d423bd1f6b00938f98d559d4fb80a9c442ed531.tar.xz
torbrowser tests: allow download via tor to take 10 more minutes
-rwxr-xr-xbin/test_torbrowser-launcher.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index fddca88c..210355e8 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -283,10 +283,14 @@ download_and_launch() {
if [ -n "$SETTINGS_DONE" ] ; then
announce_failure_and_exit "$(date -u) - settings dialog still there, please investigate."
fi
- # allow the download to take up to ~22 minutes (1323 seconds)
+ if $VIA_TOR ; then
+ MAX_LOOP=52 # allow the download to take up to ~31 minutes (1898 seconds) via tor
+ else
+ MAX_LOOP=42 # allow the download to take up to ~22 minutes (1323 seconds) via https
+ fi
# ( echo -n "0" ; for i in $(seq 1 42) ; do echo -n "+$i+10" ; done ; echo ) | bc
# we watch the download directory and parse torbrowser-launchers stdout, so usually this loop won't run this long
- for i in $(seq 1 42) ; do
+ for i in $(seq 1 $MAX_LOOP) ; do
sleep 10 ; sleep $i
STATUS="$(grep '^Download error:' $TBL_LOGFILE || true)"
if [ -n "$STATUS" ] ; then