[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: start dbus
Holger Levsen
holger at moszumanska.debian.org
Sun Nov 15 16:15:43 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 e6a976ee9bbfec6e8eaeb0af97296a3e7f10b4e9
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Nov 15 17:15:28 2015 +0100
torbrowser tests: start dbus
---
bin/test_torbrowser-launcher.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 283ac35..b329f57 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -17,7 +17,8 @@ cleanup_all() {
[ ! -f screenshot.png ] || mv screenshot.png $RESULTS/
[ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $RESULTS/
[ ! -f test-torbrowser-$SUITE.mpg ] || mv test-torbrowser-$SUITE.mpg $RESULTS/
- # delete session if it still exists
+ # shutdown and end session if it still exists
+ schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus stop || true
schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true
# delete main work dir
cd
@@ -38,10 +39,12 @@ update_screenshot() {
}
first_test() {
+ echo
local SESSION="tbb-launcher-$SUITE-$(basename $TMPDIR)"
schroot --begin-session --session-name=$SESSION -c jenkins-torbrowser-launcher-$SUITE
schroot --run-session -c $SESSION --directory /tmp -u root -- mkdir $HOME
schroot --run-session -c $SESSION --directory /tmp -u root -- chown jenkins:jenkins $HOME
+ schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus start
SCREEN=77
Xvfb -ac -br -screen 0 1024x768x16 :$SCREEN &
XPID=$!
@@ -61,8 +64,10 @@ first_test() {
sleep 15
update_screenshot
done
+ schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus stop
schroot --end-session -c $SESSION
kill $XPID $FFMPEGPID || true
+ echo
}
#
--
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