Merge lp:~pitti/autopilot/fix-gdk-display into lp:autopilot

[Martin Pitt]

Fix initialization of GdkDisplay, to fix crash when accessing Window.geometry.

Fix initialization of GdkDisplay, see bzr changelog.

[Martin Pitt (pitti)]

I ran this with

PYTHONPATH=. python -m autopilot.run run autopilot.tests.functional.test_introspection_features.IntrospectionFeatureTests

as the full functional test suite currently seems to be in a rather sorry state -- I get 97 failures :(

[Martin Pitt (pitti)]

> as the full functional test suite currently seems to be in a rather sorry
> state -- I get 97 failures :(

Fixing in https://code.launchpad.net/~pitti/autopilot/fix-run.py/+merge/198292

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/autopilot-ci/351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/351/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'autopilot/process/_bamf.py'
--- autopilot/process/_bamf.py	2013-11-07 05:53:36 +0000
+++ autopilot/process/_bamf.py	2013-12-09 16:35:58 +0000
@@ -487,11 +487,11 @@
         # builder.
         from gi import require_version
         require_version('GdkX11', '3.0')
-        from gi.repository import GdkX11
+        from gi.repository import Gdk, GdkX11
         # FIXME: We need to use the gdk window here to get the real coordinates
         geometry = self._x_win.get_geometry()
         origin = GdkX11.X11Window.foreign_new_for_display(
-            GdkX11.X11Display(), self._xid).get_origin()
+            Gdk.Display().get_default(), self._xid).get_origin()
         return (origin[0], origin[1], geometry.width, geometry.height)
 
     @property

=== modified file 'autopilot/tests/functional/test_introspection_features.py'
--- autopilot/tests/functional/test_introspection_features.py	2013-12-06 00:43:23 +0000
+++ autopilot/tests/functional/test_introspection_features.py	2013-12-09 16:35:58 +0000
@@ -26,6 +26,7 @@
 import tempfile
 from tempfile import mktemp
 from testtools.matchers import Equals, IsInstance, MatchesRegex, Not, Contains
+from testtools.matchers import LessThan, GreaterThan
 from textwrap import dedent
 from six import StringIO
 
@@ -33,6 +34,7 @@
 from autopilot.testcase import AutopilotTestCase
 from autopilot.introspection.dbus import CustomEmulatorBase
 from autopilot.introspection import _connection_matches_pid
+from autopilot.display import Display
 
 
 class EmulatorBase(CustomEmulatorBase):
@@ -179,6 +181,26 @@
         self.assertThat(out, Not(Contains(
             "/Root/QMainWindow/QMenuBar/QToolButton")))
 
+    def test_window_geometry(self):
+        """Window.geometry property
+
+        Check that all Window geometry properties work and have a plausible
+        range.
+        """
+        # ensure we have at least one open app window
+        app = self.start_mock_app(EmulatorBase)
+
+        display = Display.create()
+        for monitor in range(display.get_num_screens()):
+            (_, _, swidth, sheight) = Display.create().get_screen_geometry(0)
+            for win in self.process_manager.get_open_windows():
+                geom = win.geometry
+                self.assertThat(len(geom), Equals(4))
+                self.assertThat(geom[0], GreaterThan(-1))  # no GreaterEquals
+                self.assertThat(geom[1], GreaterThan(-1))
+                self.assertThat(geom[2], LessThan(swidth + 1))
+                self.assertThat(geom[3], LessThan(sheight + 1))
+
 
 class QMLCustomEmulatorTestCase(AutopilotTestCase):
     """Test the introspection of a QML application with a custom emulator."""