[Qa-jenkins-scm] [jenkins.debian.net] 02/02: fixup 1aa66ed: torbrowser tests: add two tests using a broken user config
Holger Levsen
holger at moszumanska.debian.org
Thu Dec 10 11:00:09 UTC 2015
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 8e830a18a16f13367dbfb1c731431f433d25f07e
Author: Holger Levsen <holger at layer-acht.org>
Date: Thu Dec 10 11:59:43 2015 +0100
fixup 1aa66ed: torbrowser tests: add two tests using a broken user config
---
bin/test_torbrowser-launcher.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index f7f7d41..d8f5667 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -144,10 +144,10 @@ announce_problem_and_abort_silently() {
}
prepare_lauchner_settings() {
- if $BROKEN_SETTINGS ;
+ if $BROKEN_SETTINGS ; then
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__
+ SETTINGS=$(mktemp -t tbl-tests-XXXXXXXX)
+ cat >$SETTINGS <<-__END__
(dp0
S'accept_links'
p1
@@ -180,7 +180,11 @@ I01
sS'last_update_check_timestamp'
p13
I1449534041
-s.__END__
+__END__
+ echo -n "s." >> $SETTINGS
+ schroot --run-session -c $SESSION --preserve-environment -- mkdir -p $HOME/.config/torbrowser
+ cat $SETTINGS | schroot --run-session -c $SESSION --preserve-environment -- tee $HOME/.config/torbrowser/settings
+ rm $SETTINGS >/dev/null
else
echo "$(date -u ) - not providing any settings for torbrowser-launcher."
fi
@@ -422,7 +426,7 @@ revert_git_merge() {
if [ -z "$1" ] ; then
echo "call $0 with a suite as param."
exit 1
-elif [ "$1" = "broken_settings" ] ; then
+elif [ "$1" = "broken_config" ] ; then
BROKEN_SETTINGS=true
shift
else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list