From 8d423bd1f6b00938f98d559d4fb80a9c442ed531 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 1 Mar 2016 11:57:42 +0100 Subject: torbrowser tests: allow download via tor to take 10 more minutes --- bin/test_torbrowser-launcher.sh | 8 ++++++-- 1 file 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 -- cgit v1.2.3-70-g09d2