Merge lp:~chris.gagnon/unity/fix-endless-while-loop-in-launcher-tests into lp:unity

[Chris Gagnon]

don't get stuck in a while loop in tests/autopilot/unity/emulators/launcher.py

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3512
http://jenkins.qa.ubuntu.com/job/unity-ci/366/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/253/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/254/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/280/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/2251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/236/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3513
http://jenkins.qa.ubuntu.com/job/unity-ci/367/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/254/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/255

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

This branch is doing the same thing as this one:
https://code.launchpad.net/~townsend/unity/fix-ap-mouse-infinite-loop/+merge/186070

If you think that townsends branch needs to add something from this branch please add a comment there.

Unmerged revisions

3513. By Chris Gagnon on 2013-09-17

call raise as a statement instead of a function

3512. By Chris Gagnon on 2013-09-17

don't get stuck in a while loop in tests/autopilot/unity/emulators/launcher.py

=== modified file 'tests/autopilot/unity/emulators/launcher.py'
--- tests/autopilot/unity/emulators/launcher.py	2013-09-12 15:56:41 +0000
+++ tests/autopilot/unity/emulators/launcher.py	2013-09-17 17:03:48 +0000
@@ -12,6 +12,7 @@
 from autopilot.input import Mouse
 from autopilot.display import Display, move_mouse_to_screen
 from autopilot.keybindings import KeybindingsHelper
+from datetime import datetime, timedelta
 import logging
 from testtools.matchers import NotEquals
 from time import sleep
@@ -121,15 +122,22 @@
         logger.debug("Moving mouse to center of launcher.")
         self._mouse.move(target_x, target_y)
 
-    def move_mouse_to_icon(self, icon):
+    def move_mouse_to_icon(self, icon, timeout=20):
+
+        start = datetime.now()
+        elapsed = datetime.now() - start
         # The icon may be off the bottom of screen, so we do this in a loop:
-        while 1:
+        while elapsed < timedelta(seconds=timeout):
             target_x = icon.center_x + self.x
             target_y = icon.center_y
             if self._mouse.x == target_x and self._mouse.y == target_y:
-                break
+                return True
+            elapsed = datetime.now() - start
             self._mouse.move(target_x, target_y)
             sleep(0.5)
+        raise AssertionError(
+              "move_mouse_to_icon timed out after {} seconds".format(timeout))
+
 
     def mouse_reveal_launcher(self):
         """Reveal this launcher with the mouse.
@@ -299,7 +307,11 @@
         self._perform_switcher_binding("launcher/switcher/down")
         self._get_controller().key_nav_selection.wait_for(NotEquals(old_selection))
 
-    def click_launcher_icon(self, icon, button=1, move_mouse_after=True):
+    def click_launcher_icon(self, 
+                            icon, 
+                            button=1, 
+                            move_mouse_after=True,
+                            timeout=20):
         """Move the mouse over the launcher icon, and click it.
         `icon` must be an instance of SimpleLauncherIcon or it's descendants.
         `move_mouse_after` moves the mouse outside the launcher if true.
@@ -311,17 +323,25 @@
             icon, self.monitor, button)
         self.mouse_reveal_launcher()
 
+        start = datetime.now()
+        elapsed = datetime.now() - start
         # The icon may be off the screen, so we do this in a loop:
-        while 1:
+        while elapsed < timedelta(seconds=timeout):
             target_x = icon.center_x + self.x
             target_y = icon.center_y
             if self._mouse.x == target_x and self._mouse.y == target_y:
-                break
+                self._mouse.click(button)
+                if (move_mouse_after):
+                    self.move_mouse_to_right_of_launcher()
+
+                return True
+
+            elapsed = datetime.now() - start
             self._mouse.move(target_x, target_y )
             sleep(1)
-        self._mouse.click(button)
-        if (move_mouse_after):
-          self.move_mouse_to_right_of_launcher()
+
+        raise AssertionError(
+            "click_launcher_icon timed out after {} seconds".format(timeout))
 
     def drag_icon_to_position(self, icon, pos, target, drag_type=IconDragType.INSIDE):
         """Drag a launcher icon to a new position.
@@ -422,7 +442,7 @@
         pin_item = quicklist.get_quicklist_item_by_text('Unlock from Launcher')
         quicklist.click_item(pin_item)
 
-    def autoscroll_to_icon(self, icon, autoscroll_offset=0):
+    def autoscroll_to_icon(self, icon, autoscroll_offset=0, timeout=20):
         """Moves the mouse to the autoscroll zone to scroll the Launcher to the icon
            in question.
 
@@ -431,7 +451,10 @@
         """
         (x, y, w, h) = self.geometry
 
-        while 1:
+        start = datetime.now()
+        elapsed = datetime.now() - start
+
+        while elapsed < timedelta(seconds=timeout):
             mouse_x = target_x = icon.center_x + self.x
             mouse_y = target_y = icon.center_y
             if target_y > h:
@@ -439,9 +462,12 @@
             elif target_y < 0:
                 mouse_y = y + autoscroll_offset
             if self._mouse.x == target_x and self._mouse.y == target_y:
-                break
+                return True
+            elapsed = datetime.now() - start
             self._mouse.move(mouse_x, mouse_y)
             sleep(0.5)
+        raise AssertionError(
+            "autoscroll_to_icon timed out after {} seconds".format(timeout))
 
     @property
     def geometry(self):