diff options
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 49 | ||||
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 24 |
2 files changed, 73 insertions, 0 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index abffb839..4fb540ff 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -143,6 +143,49 @@ announce_problem_and_abort_silently() { exit 0 } +prepare_lauchner_settings() { + if $BROKEN_SETTINGS ; + echo "$(date -u ) - providing broken settings for torbrowser-launcher to test if it can deal with it." + schroot --run-session -c $SESSION --preserve-environment -- mkdir -p $HOME/.config/torbrowser + schroot --run-session -c $SESSION --preserve-environment -- tee $HOME/.config/torbrowser/settings <<-__END__ +(dp0 +S'accept_links' +p1 +I00 +sS'modem_sound' +p2 +I00 +sS'latest_version' +p3 +S'5.5a4-hardened' +p4 +sS'installed_version' +p5 +S'5.0.4' +p6 +sS'check_for_updates' +p7 +I00 +sS'mirror' +p8 +S'https://dist.torproject.org/' +p9 +sS'tbl_version' +p10 +S'0.1.9-1' +p11 +sS'update_over_tor' +p12 +I01 +sS'last_update_check_timestamp' +p13 +I1449534041 +s.__END__ + else + echo "$(date -u ) - not providing any settings for torbrowser-launcher." + fi +} + download_and_launch() { echo echo "$(date -u) - Test download_and_launch begins." @@ -182,6 +225,7 @@ download_and_launch() { echo "$(date -u) - starting torbrowser-launcher, opening settings dialog." # set PYTHONUNBUFFERED to get unbuffered output from python, so we can grep in it in real time 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 10 update_screenshot @@ -378,6 +422,11 @@ revert_git_merge() { if [ -z "$1" ] ; then echo "call $0 with a suite as param." exit 1 +elif [ "$1" = "broken_settings" ] ; then + BROKEN_SETTINGS=true + shift +else + BROKEN_SETTINGS=false fi SUITE=$1 UPGRADE_SUITE="" diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 44ebd5b9..38ca6172 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -227,6 +227,14 @@ name: '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie' - job-template: + defaults: torbrowser-launcher_git + name: '{name}_test_on_jessie_amd64_from_git_branch_debian_sid_with_broken_config' + +- job-template: + defaults: torbrowser-launcher_git + name: '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie_with_broken_config' + +- job-template: defaults: torbrowser-launcher_packages name: '{name}_test_on_wheezy_amd64_from_backports' @@ -367,6 +375,22 @@ my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie git' my_recipients: 'holger@layer-acht.org' my_node: '' + - '{name}_test_on_jessie_amd64_from_git_branch_debian_sid_with_broken_config': + my_description: 'Test torbrowser-launcher with a broken user configuration on jessie/amd64 using the branch debian/sid.' + my_timed: '23 4 1 * *' + my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git' + my_gitbranch: 'debian/sid' + my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh broken_config jessie git' + my_recipients: 'holger@layer-acht.org' + my_node: '' + - '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie_with_broken_config': + my_description: 'Test torbrowser-launcher with a broken user configuration on jessie/amd64 using the branch debian/jessie.' + my_timed: '23 4 1 * *' + my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git' + my_gitbranch: 'debian/jessie' + my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh broken_config jessie git' + my_recipients: 'holger@layer-acht.org' + my_node: '' - '{name}_test_on_wheezy_amd64_from_backports': my_description: 'Test torbrowser-launcher from backports on wheezy/amd64.' my_timed: '23 5 * * 2' |