Merge lp:~townsend/unity/fix-lp1285758 into lp:unity

[Christopher Townsend]

Fix a few randomly failing Spread Autopilot tests.

A few Spread AP tests fail randomly.

Any test that calls assertWindowIsScaledEquals() may fail since the Spread may not be completed before this is called. Fix is to add a short delay to ensure the Spread finishes.

Also, test_scaled_window_closes_on_close_button_click may fail if the system under test has an extra window open such as a terminal. If the mouse is not over the test window, then the test fails. Fix is to move the mouse over the test window.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3687
http://jenkins.qa.ubuntu.com/job/unity-ci/734/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/268

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_spread.py'
--- tests/autopilot/unity/tests/test_spread.py	2014-02-19 02:16:22 +0000
+++ tests/autopilot/unity/tests/test_spread.py	2014-02-27 16:41:03 +0000
@@ -61,6 +61,9 @@
 
     def assertWindowIsScaledEquals(self, xid, 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)))
 
@@ -133,6 +136,10 @@
         target_xid = win.x_id
         [target_win] = [w for w in self.unity.screen.scaled_windows if w.xid == target_xid]
 
+        # Make sure mouse is over the test window
+        (x1, y1, w1, h1) = target_win.geometry
+        self.mouse.move(x1 + w1 / 2, y1 + h1 / 2)
+
         (x, y, w, h) = target_win.scale_close_geometry
         self.mouse.move(x + w / 2, y + h / 2)
         sleep(.5)