Merge lp:~thomir-deactivatedaccount/autopilot/fix-input-stack into lp:autopilot

[Thomi Richards]

Make the X11 display module fail to initialise if the display information cannot be retrieved.

This branch fixes the problem where autopilot picks the wrong (X11) display stack to get display resolution in the UInput input stack.

[Christopher Lee (veebers)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/autopilot-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-raring-armhf-ci/59

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

review: Approve (continuous-integration)

=== modified file 'autopilot/display/_X11.py'
--- autopilot/display/_X11.py	2013-04-23 04:15:54 +0000
+++ autopilot/display/_X11.py	2013-05-02 16:01:31 +0000
@@ -32,6 +32,8 @@
         # no DISPlAY environment set in the package builder.
         from gi.repository import Gdk
         self._default_screen = Gdk.Screen.get_default()
+        if self._default_screen is None:
+            raise RuntimeError("Unable to determine default screen information")
         self._blacklisted_drivers = ["NVIDIA"]
 
     def get_num_screens(self):