diff options
| -rw-r--r-- | TODO | 3 | ||||
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 9 | ||||
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 4 |
3 files changed, 6 insertions, 10 deletions
@@ -407,7 +407,6 @@ The following ideas should really only be implemented for the new 'lvc*' tests.. === torbrowser-launcher_* * fix "schroot session cleanup loop" in _common.sh to ignore other schroots -* test download via system tor * test tbl in German * test tbl on i386 * test alpha releases @@ -415,9 +414,7 @@ The following ideas should really only be implemented for the new 'lvc*' tests.. ** get version from '~/.cache/torbrowser/download/RecommendedTBBVersions' ** (warning: on update checks these files are written again…) * fix broken screenshot while job is running via apache redirect -* once tbl is removed from experimental, make sure the job does nothing but detect that and exits quickly+successfully. * notifications should go somewhere public, after a while of testing. -* debug why iceweasel is needed to be installed… and ca-certificates too. * run this in qemu and enable apparmor too? -> create new tests for apparmor first :) ** extend setup_schroot.sh to also setup virtual harddrives, see http://diogogomes.com/2012/07/13/debootstrap-kvm-image/ ** install linux, grub and copy the testscript and ssh keys on the the fs 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 <return> 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… diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 1c6601ed..cb986ba5 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -158,10 +158,10 @@ - jessie: { my_hour: 3 } - wheezy: { my_hour: 4, my_weekday: 2, my_prefix: '', - my_postfix: ' python python-gtk2 python-psutil python-twisted python-lzma gnupg wmctrl tor' } + my_postfix: ' python python-gtk2 python-psutil python-twisted python-lzma gnupg wmctrl' } my_description: 'Setup {dist}/amd64 schroot for testing torbrowser-launcher.' my_timed: '42 {my_hour} * * {my_weekday}' - my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-{dist} {dist}{my_prefix} awesome dbus xterm x11-utils x11-xserver-utils feh libnotify-bin figlet build-essential fakeroot devscripts git-buildpackage lintian python-all debhelper dh-apparmor lsb-release iceweasel{my_postfix}' + my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-{dist} {dist}{my_prefix} awesome dbus xterm x11-utils x11-xserver-utils feh libnotify-bin figlet build-essential fakeroot devscripts git-buildpackage lintian python-all debhelper dh-apparmor lsb-release iceweasel ca-certificates{my_postfix}' - '{name}_test_on_{dist}_amd64{opt_name}': opt_name: '' opt_arg: '' |