Unity

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

  1. fix-lp1285367
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3688
Proposed branch: lp:~townsend/unity/fix-lp1285367
Merge into: lp:unity
Diff against target: 27 lines (+7/-0)
2 files modified
tests/autopilot/unity/tests/test_dash.py (+3/-0)
tests/autopilot/unity/tests/test_hud.py (+4/-0)
To merge this branch: bzr merge lp:~townsend/unity/fix-lp1285367
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+208487@code.launchpad.net

Commit message

Fix Dash/Hud fullscreen Autopilot window test on multi-monitor where the tests would fail depending on which monitor has the fullscreen window.

Description of the change

Fix Dash/Hud fullscreen Autopilot window test on multi-monitor where the tests would fail depending on which monitor has the fullscreen window.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3687
http://jenkins.qa.ubuntu.com/job/unity-ci/723/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/259/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/255
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/257/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3687
http://jenkins.qa.ubuntu.com/job/unity-ci/735/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/269

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py 2014-02-11 21:47:29 +0000
+++ tests/autopilot/unity/tests/test_dash.py 2014-02-26 21:52:20 +0000
@@ -161,6 +161,9 @@
161 gedit = self.process_manager.start_app("Text Editor")161 gedit = self.process_manager.start_app("Text Editor")
162 self.keyboard.press_and_release('F11')162 self.keyboard.press_and_release('F11')
163163
164 monitor = gedit.get_windows()[0].monitor
165 move_mouse_to_screen(monitor)
166
164 self.keybinding("dash/reveal")167 self.keybinding("dash/reveal")
165 self.addCleanup(self.unity.dash.ensure_hidden)168 self.addCleanup(self.unity.dash.ensure_hidden)
166169
167170
=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py 2014-02-14 16:40:28 +0000
+++ tests/autopilot/unity/tests/test_hud.py 2014-02-26 21:52:20 +0000
@@ -508,6 +508,10 @@
508 """ The Hud must not open if a window is fullscreen. """508 """ The Hud must not open if a window is fullscreen. """
509 gedit = self.process_manager.start_app("Text Editor")509 gedit = self.process_manager.start_app("Text Editor")
510 self.keyboard.press_and_release('F11')510 self.keyboard.press_and_release('F11')
511
512 monitor = gedit.get_windows()[0].monitor
513 move_mouse_to_screen(monitor)
514
511 self.keybinding("hud/reveal")515 self.keybinding("hud/reveal")
512 self.addCleanup(self.unity.hud.ensure_hidden)516 self.addCleanup(self.unity.hud.ensure_hidden)
513517