Merge lp:autopilot into lp:autopilot/1.5

[Christopher Lee]

Bugfix for lp:1308330 Simplify X11 mouse move_to_point.

Bugfix for lp:1308330. Also allows us to sync between vivid & xenial.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:576
http://jenkins.qa.ubuntu.com/job/autopilot-1.5-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-amd64-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-amd64-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-i386-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-1.5-wily-i386-ci/18/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/992/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-touch/546/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/992
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/992/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27946

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-1.5-ci/44/rebuild

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

So this doesn't build in trusty. I'm not sure if that needs to be addressed before Chris returns, so if anyone reports problems, please let me know.

=== modified file 'autopilot/input/_X11.py'
--- autopilot/input/_X11.py	2014-10-30 23:42:46 +0000
+++ autopilot/input/_X11.py	2016-02-29 21:05:52 +0000
@@ -26,6 +26,7 @@
 
 import logging
 
+from autopilot.input import get_center_point
 from autopilot.display import is_point_on_any_screen, move_mouse_to_screen
 from autopilot.utilities import (
     EventDelay,
@@ -395,57 +396,12 @@
     def move_to_object(self, object_proxy):
         """Attempts to move the mouse to 'object_proxy's centre point.
 
-        It does this by looking for several attributes, in order. The first
-        attribute found will be used. The attributes used are (in order):
-
-         * globalRect (x,y,w,h)
-         * center_x, center_y
-         * x, y, w, h
-
-        :raises: **ValueError** if none of these attributes are found, or if an
-         attribute is of an incorrect type.
+        See :py:meth:`~autopilot.input.get_center_point` for details on how
+        the center point is calculated.
 
         """
-        try:
-            x, y, w, h = object_proxy.globalRect
-            _logger.debug("Moving to object's globalRect coordinates.")
-            self.move(x+w/2, y+h/2)
-            return
-        except AttributeError:
-            pass
-        except (TypeError, ValueError):
-            raise ValueError(
-                "Object '%r' has globalRect attribute, but it is not of the "
-                "correct type" % object_proxy)
-
-        try:
-            x, y = object_proxy.center_x, object_proxy.center_y
-            _logger.debug("Moving to object's center_x, center_y coordinates.")
-            self.move(x, y)
-            return
-        except AttributeError:
-            pass
-        except (TypeError, ValueError):
-            raise ValueError(
-                "Object '%r' has center_x, center_y attributes, but they are "
-                "not of the correct type" % object_proxy)
-
-        try:
-            x, y, w, h = (
-                object_proxy.x, object_proxy.y, object_proxy.w, object_proxy.h)
-            _logger.debug(
-                "Moving to object's center point calculated from x,y,w,h "
-                "attributes.")
-            self.move(x+w/2, y+h/2)
-            return
-        except AttributeError:
-            raise ValueError(
-                "Object '%r' does not have any recognised position "
-                "attributes" % object_proxy)
-        except (TypeError, ValueError):
-            raise ValueError(
-                "Object '%r' has x,y attribute, but they are not of the "
-                "correct type" % object_proxy)
+        x, y = get_center_point(object_proxy)
+        self.move(x, y)
 
     def position(self):
         """

=== modified file 'autopilot/input/__init__.py'
--- autopilot/input/__init__.py	2015-08-19 00:25:00 +0000
+++ autopilot/input/__init__.py	2016-02-29 21:05:52 +0000
@@ -57,14 +57,17 @@
 
 from collections import OrderedDict
 from contextlib import contextmanager
+from autopilot.input._common import get_center_point
 from autopilot.utilities import _pick_backend, CleanupRegistered
-from autopilot.input._common import get_center_point
 
 import logging
 
 _logger = logging.getLogger(__name__)
 
 
+__all__ = ['get_center_point']
+
+
 class Keyboard(CleanupRegistered):
 
     """A simple keyboard device class.
@@ -653,23 +656,19 @@
             press_duration=0.10,
             time_between_events=0.1):
         """
-        Attempts to move the pointer to 'object_proxy's centre point.
-        and click a button
-
-        It does this by looking for several attributes, in order. The first
-        attribute found will be used. The attributes used are (in order):
-
-         * globalRect (x,y,w,h)
-         * center_x, center_y
-         * x, y, w, h
+        Attempts to move the pointer to 'object_proxy's centre point
+        and click a button.
+
+        See :py:meth:`~autopilot.input.get_center_point` for details on how
+        the center point is calculated.
 
         If the wrapped device is a mouse, the button specification is used. If
         it is a touch device, passing anything other than 1 will raise a
         ValueError exception.
 
         :param time_between_events: takes floating point to represent the
-          delay time between subsequent clicks/taps. Default value 0.1
-          represents tenth of a second.
+            delay time between subsequent clicks/taps. Default value 0.1
+            represents tenth of a second.
 
         """
 
@@ -679,15 +678,8 @@
     def move_to_object(self, object_proxy):
         """Attempts to move the pointer to 'object_proxy's centre point.
 
-        It does this by looking for several attributes, in order. The first
-        attribute found will be used. The attributes used are (in order):
-
-         * globalRect (x,y,w,h)
-         * center_x, center_y
-         * x, y, w, h
-
-        :raises: **ValueError** if none of these attributes are found, or if an
-         attribute is of an incorrect type.
+        See :py:meth:`~autopilot.input.get_center_point` for details on how
+        the center point is calculated.
 
         """
         x, y = get_center_point(object_proxy)

=== modified file 'autopilot/input/_common.py'
--- autopilot/input/_common.py	2014-03-25 14:42:25 +0000
+++ autopilot/input/_common.py	2016-02-29 21:05:52 +0000
@@ -29,7 +29,11 @@
     """Get the center point of an object.
 
     It searches for several different ways of determining exactly where the
-    center is.
+    center is. The attributes used are (in order):
+
+     * globalRect (x,y,w,h)
+     * center_x, center_y
+     * x, y, w, h
 
     :raises ValueError: if `object_proxy` has the globalRect attribute but it
         is not of the correct type.

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2015-07-07 22:12:40 +0000
+++ autopilot/input/_uinput.py	2016-02-29 21:05:52 +0000
@@ -25,7 +25,7 @@
 
 from autopilot.input import Keyboard as KeyboardBase
 from autopilot.input import Touch as TouchBase
-from autopilot.input._common import get_center_point
+from autopilot.input import get_center_point
 from autopilot.utilities import deprecated, EventDelay, sleep
 
 

=== modified file 'autopilot/introspection/_search.py'
--- autopilot/introspection/_search.py	2015-06-16 02:39:23 +0000
+++ autopilot/introspection/_search.py	2016-02-29 21:05:52 +0000
@@ -692,7 +692,7 @@
     def __call__(self, pid):
         if self._cached_result is None:
             self._cached_result = [
-                p.pid for p in psutil.Process(pid).get_children(recursive=True)
+                p.pid for p in psutil.Process(pid).children(recursive=True)
             ]
         return self._cached_result
 

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2015-08-19 00:25:00 +0000
+++ autopilot/tests/functional/test_input_stack.py	2016-02-29 21:05:52 +0000
@@ -43,8 +43,7 @@
 )
 from autopilot.display import Display
 from autopilot.gestures import pinch
-from autopilot.input import Keyboard, Mouse, Pointer, Touch
-from autopilot.input._common import get_center_point
+from autopilot.input import Keyboard, Mouse, Pointer, Touch, get_center_point
 from autopilot.matchers import Eventually
 from autopilot.testcase import AutopilotTestCase, multiply_scenarios
 from autopilot.tests.functional import QmlScriptRunnerMixin

=== modified file 'autopilot/tests/unit/test_input.py'
--- autopilot/tests/unit/test_input.py	2015-07-07 22:50:24 +0000
+++ autopilot/tests/unit/test_input.py	2016-02-29 21:05:52 +0000
@@ -30,8 +30,7 @@
     tests,
     utilities
 )
-from autopilot.input import _uinput
-from autopilot.input._common import get_center_point
+from autopilot.input import _uinput, get_center_point
 
 
 class Empty(object):