[Qa-jenkins-scm] [jenkins.debian.net] 04/07: torbrowser tests: allow the download to take up to 15 minutes

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit ed4192bf85162cfbdbacf4a9b009c61dfd076965
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Nov 19 02:41:37 2015 +0100

    torbrowser tests: allow the download to take up to 15 minutes
---
 bin/test_torbrowser-launcher.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 6b659a1..e81f27c 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -189,7 +189,9 @@ download_and_launch() {
 		cleanup_duplicate_screenshots
 		exit 1
 	fi
-	for i in $(seq 1 40) ; do
+	# allow the download to take up to 15 minutes
+	# we watch the download directory and parse torbrowser-launchers stdout, so usually this loop won't run this long
+	for i in $(seq 1 60) ; do
 		sleep 15
 		STATUS="$(grep '^Download error:' $TBL_LOGFILE || true)"
 		if [ -n "$STATUS" ] ; then
@@ -203,7 +205,6 @@ download_and_launch() {
 
 		STATUS="$(schroot --run-session -c $SESSION -- test ! -d $HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser -a ! -d $HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_de/Browser || echo $(date -u ) - torbrowser downloaded and installed, configuring tor now. )"
 		if [ -n "$STATUS" ] ; then
-			sleep 10
 			update_screenshot
 			break
 		fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git