Merge lp:~townsend/unity/fix-ap-mouse-infinite-loop into lp:unity
Status: | Merged |
---|---|
Approved by: | Francis Ginther |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3512 |
Proposed branch: | lp:~townsend/unity/fix-ap-mouse-infinite-loop |
Merge into: | lp:unity |
Diff against target: |
108 lines (+23/-38) 2 files modified
tests/autopilot/unity/emulators/launcher.py (+21/-36) tests/autopilot/unity/tests/launcher/test_scroll.py (+2/-2) |
To merge this branch: | bzr merge lp:~townsend/unity/fix-ap-mouse-infinite-loop |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Brandon Schaefer (community) | Approve | ||
Review via email: mp+186070@code.launchpad.net |
Commit message
Make the mouse movement infinite while loop into a for loop and only iterate 10 times w/ a 0.5 second delay between movements. Raise an error if the correct icon is not found when the loop terminates.
Consolidate the autoscroll_
Description of the change
= Issue =
Some AP tests will move the mouse to a specific icon. The function to handle moving the mouse to the icon contained an infinite loop to move the mouse. The infinite loop was to make sure the Launcher would scroll since the icon could be off the screen. However, certain conditions can cause the Launcher to not scroll which led to a very long delay in the AP test of 7200 seconds! This also led to no movie of the failure to be created.
= Fix =
Instead of using an infinite while loop, now instead use a for loop and only iterate 10 times with a 0.5 second delay between movements. If the icon is not found after the loop terminates, raise an error which will fail the test and we should have a movie of what was causing the Launcher to not scroll.
I also consolidated the autoscroll_
FAILED: Continuous integration, rev:3512 jenkins. qa.ubuntu. com/job/ unity-ci/ 365/ jenkins. qa.ubuntu. com/job/ unity-saucy- amd64-ci/ 254/console jenkins. qa.ubuntu. com/job/ unity-saucy- armhf-ci/ 252/console jenkins. qa.ubuntu. com/job/ unity-saucy- i386-ci/ 253/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-ci/ 365/rebuild
http://