r51894 - in /desktop/unstable/gnome-photos/debian: changelog control patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch patches/series tests/unit-tests
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Mon Jan 9 18:55:41 UTC 2017
Author: laney
Date: Mon Jan 9 18:55:40 2017
New Revision: 51894
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51894
Log:
* debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch:
Take patch from upstream bug #777053 to resolve race condition in
testsuite.
* debian/tests/unit-tests: Don't fail on expected stderr from dbus-daemon.
Added:
desktop/unstable/gnome-photos/debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch
Modified:
desktop/unstable/gnome-photos/debian/changelog
desktop/unstable/gnome-photos/debian/control
desktop/unstable/gnome-photos/debian/patches/series
desktop/unstable/gnome-photos/debian/tests/unit-tests
Modified: desktop/unstable/gnome-photos/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/changelog?rev=51894&op=diff
==============================================================================
--- desktop/unstable/gnome-photos/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-photos/debian/changelog [utf-8] Mon Jan 9 18:55:40 2017
@@ -1,3 +1,12 @@
+gnome-photos (3.22.3-2) UNRELEASED; urgency=medium
+
+ * debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch:
+ Take patch from upstream bug #777053 to resolve race condition in
+ testsuite.
+ * debian/tests/unit-tests: Don't fail on expected stderr from dbus-daemon.
+
+ -- Iain Lane <laney at debian.org> Mon, 09 Jan 2017 18:10:22 +0000
+
gnome-photos (3.22.3-1) unstable; urgency=medium
* New upstream release.
Modified: desktop/unstable/gnome-photos/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/control?rev=51894&op=diff
==============================================================================
--- desktop/unstable/gnome-photos/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-photos/debian/control [utf-8] Mon Jan 9 18:55:40 2017
@@ -6,7 +6,7 @@
Section: gnome
Priority: extra
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 10),
desktop-file-utils,
gnome-pkg-tools,
Added: desktop/unstable/gnome-photos/debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch?rev=51894&op=file
==============================================================================
--- desktop/unstable/gnome-photos/debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch (added)
+++ desktop/unstable/gnome-photos/debian/patches/0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch [utf-8] Mon Jan 9 18:55:40 2017
@@ -0,0 +1,46 @@
+From 53cc7e87bc32ac4c5bbfdc1c943b28bb258aefa7 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Mon, 9 Jan 2017 17:58:50 +0000
+Subject: [PATCH] tests: Wait for the UI to be drawn completely
+
+We have been seeing tests fail with
+
+ ValueError: Attempting to generate a mouse event at negative coordinates: (-2147483647.5,-2147483647.5)
+
+because the UI isn't drawn when we try to interact with it. This is a
+race condition.
+
+Wait until the x or y coordinate is valid before going on with the test.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777053
+---
+ tests/basic.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/basic.py b/tests/basic.py
+index ea10ece..1dfa17f 100755
+--- a/tests/basic.py
++++ b/tests/basic.py
+@@ -4,7 +4,7 @@ from testutil import *
+
+ from gi.repository import Gio, GLib
+
+-import os, sys
++import os, time, sys
+ import pyatspi
+ from dogtail import tree
+ from dogtail import utils
+@@ -15,6 +15,10 @@ try:
+ app = start()
+
+ albums_button = app.child('Albums')
++ x = y = -1
++ while x < 0 and y < 0:
++ (x, y) = albums_button.position
++ time.sleep(0.1)
+ albums_button.click()
+ photos_button = app.child('Photos')
+ photos_button.click()
+--
+2.11.0
+
Modified: desktop/unstable/gnome-photos/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/patches/series?rev=51894&op=diff
==============================================================================
--- desktop/unstable/gnome-photos/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-photos/debian/patches/series [utf-8] Mon Jan 9 18:55:40 2017
@@ -1,2 +1,3 @@
+0001-tests-Wait-for-the-UI-to-be-drawn-completely.patch
90_drop-onlyshowin.patch
drop-jp2-gegl-check.patch
Modified: desktop/unstable/gnome-photos/debian/tests/unit-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-photos/debian/tests/unit-tests?rev=51894&op=diff
==============================================================================
--- desktop/unstable/gnome-photos/debian/tests/unit-tests [utf-8] (original)
+++ desktop/unstable/gnome-photos/debian/tests/unit-tests [utf-8] Mon Jan 9 18:55:40 2017
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
-dbus-run-session -- xvfb-run -a make -C tests check
+dbus-run-session -- xvfb-run -a make -C tests check 2> >(grep -vE '^(Activating|Successfully activated)')>&2
More information about the pkg-gnome-commits
mailing list