Merge lp:~bregma/unity/lp-1436095 into lp:unity

[Stephen M. Webb]

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

Fixes a couple of recurring AP test errors to do with closing windows in the spread.

It seems the D-Bus introspection class of the Autopilot suite raises an exception when you're trying to examine certain data that does not match some criterion (the likes of which was not worth investigating) and the order of appearance of the data was largely random, so the closing-windows-in-the-spread test would error out just as randomly.

Note that these were not failing tests but errors in the test infrastructure. The workaround is to catch the raised exceptions and ignore them, because they only happened on irrelevant data that was being filtered out any way.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/unity-ci/1171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/58

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, makes sense. +1

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-03-24 22:42:09 +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"""