From c4fced1935117844166b3e7f7067a0392ac137b6 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 28 Jan 2016 01:26:47 +0100 Subject: torbrowser tests: install ca-certificates by setup job again, as long as #805173 is still open in any suite --- bin/test_torbrowser-launcher.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'bin') 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 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… -- cgit v1.2.3-70-g09d2