[Qa-jenkins-scm] [jenkins.debian.net] 01/01: refactor

[Holger Levsen]

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 8e8b549db9eb8c4d96050af9577ee4f694a343bf
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Nov 14 18:51:56 2015 +0100

    refactor
---
 bin/test_torbrowser-launcher.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 4768308..b37b991 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -10,7 +10,9 @@ common_init "$@"
 set -e
 
 cleanup_all() {
+	set +e
 	cd
+	mv screenshot.png screenshot-thumb.png $WORKSPACE/ || true
 	# delete session if it still exists
 	schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true
 	# delete main work dir
@@ -18,7 +20,6 @@ cleanup_all() {
 	# kill xvfb
 	kill $XPID
 	# end
-	mv screenshot.png screenshot-thumb.png $WORKSPACE/ || true
 	echo "$(date -u) - $TMPDIR deleted. Cleanup done."
 }
 
@@ -44,8 +45,8 @@ first_test() {
 		sleep 1m
 		update_screenshot
 	done
-	kill $XPID
 	schroot --end-session -c $SESSION
+	kill $XPID || true
 	if ! "$DEBUG" ; then set +x ; fi
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git