Merge lp:~canonical-platform-qa/autopilot/overlay_fix-touch-device into lp:autopilot/overlay

[Christopher Lee]

Create correct touch device at creation to stop unity8 erroneously changing to windowed mode. (Fixes lp:1471598).

Create correct touch device at creation to stop unity8 erroneously changing to windowed mode. (Fixes lp:1471598).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:560
http://jenkins.qa.ubuntu.com/job/autopilot-overlay-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-amd64-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-amd64-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-i386-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-overlay-vivid-i386-ci/1/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3390
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3387
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3387/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21709

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

review: Approve (continuous-integration)

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2015-03-16 15:14:27 +0000
+++ autopilot/input/_uinput.py	2015-07-08 01:17:08 +0000
@@ -23,7 +23,6 @@
 
 from evdev import UInput, ecodes as e
 
-import autopilot.platform
 from autopilot.input import Keyboard as KeyboardBase
 from autopilot.input import Touch as TouchBase
 from autopilot.input._common import get_center_point
@@ -325,13 +324,7 @@
 
 
 def _get_touch_tool():
-    # android uses BTN_TOOL_FINGER, whereas desktop uses BTN_TOUCH. I have
-    # no idea why...
-    if autopilot.platform.model() == 'Desktop':
-        touch_tool = e.BTN_TOUCH
-    else:
-        touch_tool = e.BTN_TOOL_FINGER
-    return touch_tool
+    return e.BTN_TOUCH
 
 
 class _UInputTouchDevice(object):
@@ -378,7 +371,7 @@
         self._device.write(
             e.EV_ABS, e.ABS_MT_TRACKING_ID, self._get_next_tracking_id())
         press_value = 1
-        self._device.write(e.EV_KEY, e.BTN_TOOL_FINGER, press_value)
+        self._device.write(e.EV_KEY, _get_touch_tool(), press_value)
         self._device.write(e.EV_ABS, e.ABS_MT_POSITION_X, int(x))
         self._device.write(e.EV_ABS, e.ABS_MT_POSITION_Y, int(y))
         self._device.write(e.EV_ABS, e.ABS_MT_PRESSURE, 400)
@@ -430,7 +423,7 @@
         lift_tracking_id = -1
         self._device.write(e.EV_ABS, e.ABS_MT_TRACKING_ID, lift_tracking_id)
         release_value = 0
-        self._device.write(e.EV_KEY, e.BTN_TOOL_FINGER, release_value)
+        self._device.write(e.EV_KEY, _get_touch_tool(), release_value)
         self._device.syn()
         self._release_touch_finger()
 

=== modified file 'autopilot/tests/unit/test_input.py'
--- autopilot/tests/unit/test_input.py	2015-03-22 06:20:40 +0000
+++ autopilot/tests/unit/test_input.py	2015-07-08 01:17:08 +0000
@@ -468,7 +468,7 @@
             call.write(
                 ecodes.EV_ABS, ecodes.ABS_MT_TRACKING_ID, tracking_id),
             call.write(
-                ecodes.EV_KEY, ecodes.BTN_TOOL_FINGER, press_value),
+                ecodes.EV_KEY, ecodes.BTN_TOUCH, press_value),
             call.write(ecodes.EV_ABS, ecodes.ABS_MT_POSITION_X, x),
             call.write(ecodes.EV_ABS, ecodes.ABS_MT_POSITION_Y, y),
             call.write(ecodes.EV_ABS, ecodes.ABS_MT_PRESSURE, 400),
@@ -493,7 +493,7 @@
             call.write(
                 ecodes.EV_ABS, ecodes.ABS_MT_TRACKING_ID, lift_tracking_id),
             call.write(
-                ecodes.EV_KEY, ecodes.BTN_TOOL_FINGER, release_value),
+                ecodes.EV_KEY, ecodes.BTN_TOUCH, release_value),
             call.syn()
         ]
         self.assertEqual(expected_calls, touch._device.mock_calls)

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-08 04:45:01 +0000
+++ debian/changelog	2015-07-08 01:17:08 +0000
@@ -1,12 +1,52 @@
-autopilot (1.5.0) UNRELEASED; urgency=medium
-
+autopilot (1.5.1+15.04.20150522-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Christopher Lee, Federico Gimenez, Leo Arias, Richard Huddie, Vincent Ladeuil ]
+  * Bug fixes for logging (debug level now -vv) and application of CPO
+    bases for proxy objects. (LP: #1425721, #1376996, #1420949)
+
+ -- CI Train Bot <[e-mail]>  Fri, 22 May 2015 16:54:03 +0000
+
+autopilot (1.5.0+15.04.20150408-0ubuntu1) vivid; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Bug fixes related to improving automated runs.
+
+  [ Christopher Lee ]
+  * Bug fixes related to improving automated runs.
+
+ -- CI Train Bot <[e-mail]>  Wed, 08 Apr 2015 15:07:28 +0000
+
+autopilot (1.5.0+15.04.20150323-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Christopher Lee ]
+  * Bugfix for Touch pointer pressed. Packaging req. due to python3-xlib
+    bug.
+
+  [ Leo Arias ]
+  * Bugfix for Touch pointer pressed. Packaging req. due to python3-xlib
+    bug.
+
+ -- CI Train Bot <[e-mail]>  Mon, 23 Mar 2015 09:34:31 +0000
+
+autopilot (1.5.0+15.04.20150226.1-0ubuntu1) vivid; urgency=medium
+
+  [ Christopher Lee ]
   * Fix for desktop file name change (lp:1411096)
     Fix for config value containing '=' char (lp:1408317)
     Fix for skipped tests not appearing in log (lp:1414632)
     Add json docs build (for web publish) (lp:1409778)
     Documentation improvements for API, Tutorial, FAQ, and Guidelines
 
- -- Christopher Lee <[e-mail]>  Fri, 27 Feb 2015 10:16:42 +1300
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+ -- CI Train Bot <[e-mail]>  Thu, 26 Feb 2015 22:47:35 +0000
 
 autopilot (1.5.0+15.04.20141031-0ubuntu1) vivid; urgency=low
 
@@ -131,7 +171,7 @@
   * Remove python2 packages and dependencies, as they're now handled by the
     autopilot-legacy source package. (lp: #1308661)
   * Autopilot vis tool can now search the introspection tree. (lp: #1097392)
-  * Autopilot vis tool can now draw a transparent overlay over the selected 
+  * Autopilot vis tool can now draw a transparent overlay over the selected
     widget.
   * Autopilot vis tool now shows the root of the introspection tree (lp: #1298600)
   * Autopilot vis tool can now be launched from the unity dash.
@@ -265,7 +305,7 @@
 
 autopilot (1.4+14.04.20140310.1-0ubuntu1) trusty; urgency=low
 
-  * 
+  *
 
  -- Ubuntu daily release <[e-mail]>  Mon, 10 Mar 2014 19:39:00 +0000