summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-16 22:40:13 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-16 22:40:13 +0100
commit554a48495c1efc9dd1b1a5be41f2aeb9acc29707 (patch)
treea0d3425f888b051bb3d5ee148d14696aabe27e33 /bin
parentfdc671703afc6c3e33235f287226596d4abb09d6 (diff)
downloadjenkins.debian.net-554a48495c1efc9dd1b1a5be41f2aeb9acc29707.tar.xz
torbrowser tests: delete similar images more aggressivly, but backwards
Diffstat (limited to 'bin')
-rwxr-xr-xbin/test_torbrowser-launcher.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 300c2502..9938a513 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -41,12 +41,14 @@ cleanup_all() {
cleanup_duplicate_screenshots() {
echo "$(date -u) - removing duplicate screenshots."
- MAXDIFF=250 # pixels
+ MAXDIFF=2500 # pixels
cd $RESULTS
- for i in *.png ; do
- for j in *.png ; do
+ for i in $(ls -r1 *.png | xargs echo) ; do
+ for j in $(ls -r1 *.png | xargs echo) ; do
if [ "$j" = "$i" ] ; then
break
+ elif [ ! -f $j ] || [ ! -f $i ] ; then
+ break
fi
PIXELS=$(compare -metric AE $i $j /dev/null 2>&1 || true)
if [[ "$PIXELS" =~ ^[0-9]+$ ]] && [ $PIXELS -le $MAXDIFF ] ; then
@@ -160,8 +162,8 @@ download_and_launch() {
cleanup_duplicate_screenshots
exit 1
fi
- for i in $(seq 1 20) ; do
- sleep 30
+ for i in $(seq 1 40) ; do
+ sleep 15
STATUS="$(grep '^Download error:' $TBL_LOGFILE || true)"
if [ -n "$STATUS" ] ; then
echo "'$(date -u) - $STATUS'" | tee | xargs schroot --run-session -c $SESSION --preserve-environment -- notify-send -u critical