diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-11-14 18:27:49 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-11-14 18:27:49 +0100 |
| commit | 994309ef62ff2ff3473dd6c0cebec2649a871276 (patch) | |
| tree | 920f7b3e6fa84caab6845baefc4836fae384a2ab | |
| parent | 403257f2b285175486a13f0c4908dd2f7fcae451 (diff) | |
| download | jenkins.debian.net-994309ef62ff2ff3473dd6c0cebec2649a871276.tar.xz | |
refactor
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index fd324db6..9fb07273 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -18,6 +18,7 @@ cleanup_all() { # kill xvfb kill $XPID # end + mv screenshot.png screenshot-thumb.png $WORKSPACE/ || true echo "$(date -u) - $TMPDIR deleted. Cleanup done." } @@ -32,15 +33,13 @@ first_test() { XPID=$! export DISPLAY=":$SCREEN.0" timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- torbrowser-launcher https://www.debian.org & - sleep 5m - xwd -root -silent -display :$SCREEN.0 | xwdtopnm > session.pnm - sleep 5m + sleep 2m + xwd -root -silent -display :$SCREEN.0 | xwdtopnm > screenshot.pnm + sleep 2m kill $XPID - schroot --end-session -c $SESSION - gocr session.pnm - pnmtopng session.pnm > screenshot.png + schroot --end-screenshot -c $SESSION + pnmtopng screenshot.pnm > screenshot.png convert screenshot.png -adaptive-resize 128x96 screenshot-thumb.png - echo "session.jpg should be made availble for download" if ! "$DEBUG" ; then set +x ; fi } @@ -56,7 +55,7 @@ cd $TMPDIR SUITE=$1 echo "$(date -u) - testing torbrowser-launcher on $SUITE now." # -# this is WIP in an early stage (and it won't work as X ain't configured yet) +# this is WIP in an early stage # - test package build from git (todo) # - test package from the archive (in progress) # - test updates (todo) |