Merge lp:~townsend/unity/fix-failing-ap-drag-test into lp:unity

[Christopher Townsend]

When dragging and dropping an icon before another icon, the calculation to position the drop was off by half an icon which would cause some AP tests to fail.

= Issue =
A couple of AP tests that test dragging icons were failing due to the icon not being correctly placed in the Launcher.

= Fix =
The calculation to find the correct place to drop the icon was off by half the height of the icon.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3517
http://jenkins.qa.ubuntu.com/job/unity-ci/371/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/258
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/259/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/emulators/launcher.py'
--- tests/autopilot/unity/emulators/launcher.py	2013-09-17 15:01:28 +0000
+++ tests/autopilot/unity/emulators/launcher.py	2013-09-18 18:43:39 +0000
@@ -377,7 +377,7 @@
         if target_y < icon.center_y:
             target_y += icon_height / 2
         if pos == IconDragType.BEFORE:
-            target_y -= icon_height
+            target_y -= icon_height + (icon_height / 2)
 
         self.move_mouse_to_icon(icon)
         self._mouse.press()