Merge lp:~pitti/autopilot/fix-uinput into lp:autopilot

[Martin Pitt]

Replace group membership based access to /dev/uinput with dynamic ACLs for the current foreground session, and drop the /dev/autopilot-uinput symlink and "autopilot" group.

Fix permission and symlink handling for /dev/uinput. Please see the individual commit logs and the bug report for details.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:509
http://jenkins.qa.ubuntu.com/job/autopilot-ci/834/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3957
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3957/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10673
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2418/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

Jean-Baptiste tested that udev rule yesterday on another phone. I just tested the complete package on mako build 157:

 * download/adb push above armhf binaries, install them, and remount / read-only again
 * Ensure udev rule is being applied during upgrade:

   $ getfacl /dev/uinput
   getfacl: Removing leading '/' from absolute path names
   # file: dev/uinput
   # owner: root
   # group: 110
   user::rw-
   user:phablet:rw-
   group::rw-
   mask::rw-
   other::---

   (notice the user:phablet -- that's the ACL)

 * Clean up after previous autopilot:
   sudo deluser phablet autopilot
   sudo delgroup --system autopilot

 * $ test -w /dev/uinput && echo yes
   yes

 * Run AP test for calculator (on desktop, not phablet-shell):
  $ bzr checkout --lightweight lp:ubuntu-calculator-app
  $ adt-run ubuntu-calculator-app/ --click com.ubuntu.calculator --- ssh -s adb
  -> success

 * Reboot, re-run the last two commands successfully

[Christopher Lee (veebers)]

LGTM

review: Approve

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2014-05-23 13:25:43 +0000
+++ autopilot/input/_uinput.py	2014-07-30 10:33:25 +0000
@@ -20,7 +20,6 @@
 """UInput device drivers."""
 
 import logging
-import os.path
 
 from evdev import UInput, ecodes as e
 
@@ -35,11 +34,8 @@
 
 
 def _get_devnode_path():
-    """Provide a fallback uinput node for devices which don't support udev"""
-    devnode = '/dev/autopilot-uinput'
-    if not os.path.exists(devnode):
-        devnode = '/dev/uinput'
-    return devnode
+    """Return the uinput device node"""
+    return '/dev/uinput'
 
 
 class _UInputKeyboardDevice(object):

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2014-05-23 13:12:50 +0000
+++ autopilot/tests/functional/test_input_stack.py	2014-07-30 10:33:25 +0000
@@ -50,12 +50,10 @@
 
     def setUp(self):
         super(InputStackKeyboardBase, self).setUp()
-        if self.backend == 'UInput' and not (
-                os.access('/dev/autopilot-uinput', os.W_OK) or
-                os.access('/dev/uinput', os.W_OK)):
+        if self.backend == 'UInput' and not os.access('/dev/uinput', os.W_OK):
             raise SkipTest(
                 "UInput backend currently requires write access to "
-                "/dev/autopilot-uinput or /dev/uinput")
+                "/dev/uinput")
 
 
 class InputStackKeyboardCreationTests(InputStackKeyboardBase):

=== modified file 'debian/61-autopilot3-uinput.rules'
--- debian/61-autopilot3-uinput.rules	2014-04-28 23:13:02 +0000
+++ debian/61-autopilot3-uinput.rules	2014-07-30 10:33:25 +0000
@@ -1,2 +1,2 @@
-# Creates autopilot group specific access to /dev/uinput
-KERNEL=="uinput", SUBSYSTEM=="misc", SYMLINK="autopilot-uinput", GROUP="autopilot", MODE="0660"
+# Make local foreground session able to run autopilot
+KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess"

=== modified file 'debian/python3-autopilot.postinst'
--- debian/python3-autopilot.postinst	2013-09-12 16:07:27 +0000
+++ debian/python3-autopilot.postinst	2014-07-30 10:33:25 +0000
@@ -3,22 +3,9 @@
 
 set -e
 
-AUTOPILOT_GROUP=autopilot
-
 if [ "$1" = configure ]; then
-    # Add the autopilot group
-    addgroup --quiet \
-             --system \
-             --no-create-home \
-             "$AUTOPILOT_GROUP" || true
-
-    # Add each sudo user to the autopilot group
-    for u in $(getent group sudo | sed -e "s/^.*://" -e "s/,/ /g"); do
-        adduser --quiet "$u" "$AUTOPILOT_GROUP" > /dev/null || true
-    done
-
-    # udev rules were installed, trigger creation of the /dev node
-    udevadm trigger --action=change
+    # udev rules were installed, trigger update of /dev/uinput
+    udevadm trigger --action=change --sysname-match=uinput
 fi
 
 #DEBHELPER#