Merge lp:~townsend/unity/fix-lp1436095-trusty into lp:unity/7.2

[Christopher Townsend]

AP tests: accounted for arbitrarily-raised exceptions in checking scaled windows

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/2/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'tests/autopilot/unity/tests/test_spread.py'
--- tests/autopilot/unity/tests/test_spread.py	2014-03-05 22:14:16 +0000
+++ tests/autopilot/unity/tests/test_spread.py	2015-05-15 19:56:54 +0000
@@ -59,13 +59,22 @@
         self.assertThat(lambda: self.unity.screen.spread_filter, Eventually(NotEquals(None)))
         return self.unity.screen.spread_filter
 
-    def assertWindowIsScaledEquals(self, xid, scaled):
+    def assertWindowIsScaledEquals(self, xid, is_scaled):
         """Assert weather a window is scaled"""
-        # Add a short delay to ensure the Spread has finished.
-        sleep(0.5)
-
-        refresh_fn = lambda: xid in [w.xid for w in self.unity.screen.scaled_windows]
-        self.assertThat(refresh_fn, Eventually(Equals(scaled)))
+        def scaled_windows_for_screen_contains_xid():
+            """Predicates the window is in the list of scaled windows for the screen.
+               The DBus introspection object actually raises an exception if you try to look
+               at a window in the scaled_windows list and it's not a scaled window.  Buggzorz.
+            """
+            scaled_windows = self.unity.screen.scaled_windows
+            for w in scaled_windows:
+                try:
+                    if xid == w.xid:
+                        return True
+                except:
+                    pass
+            return False
+        self.assertThat(scaled_windows_for_screen_contains_xid, Eventually(Equals(is_scaled)))
 
     def assertWindowIsClosed(self, xid):
         """Assert that a window is not in the list of the open windows"""