Merge lp:~fginther/autopilot/uinput-fallback into lp:autopilot

[Francis Ginther]

Allow fallback to /dev/uinput if /dev/autopilot-uinput does not exist.

The touch image does not support udev and therefore does not have /dev/autopilot-udev. It does have /dev/uinput. So the solution is to fallback and attempt to use /dev/uinput. This should be a short-term workaround until the touch images enable udev support.

Allow fallback to /dev/uinput if /dev/autopilot-uinput does not exist.

The touch image does not support udev and therefore does not have /dev/autopilot-udev. It does have /dev/uinput. So the solution is to fallback and attempt to use /dev/uinput. This should be a short-term workaround until the touch images enable udev support.

If /dev/autopilot-uinput is not present and /dev/uinput is not writable, the follow error occurs:
RuntimeError: Unable to instantiate any backends
UInput: UInputError('"/dev/uinput" cannot be opened for writing',)

om26er tested the fix on a touch image.

[Thomi Richards (thomir-deactivatedaccount)]

There are functional tests that need to be updated as well, specifically:

autopilot/tests/functional/test_input_stack.py line 44

review: Needs Fixing

[Christopher Lee (veebers)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/autopilot-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/17

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

review: Approve (continuous-integration)

[lp:~fginther/autopilot/uinput-fallback]

212. By Francis Ginther on 2013-05-16

Updated test_input_stack functional tests to also fallback to /dev/uinput. Renamed _get_devnode_name to _get_devnode_path.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/autopilot-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/18

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

review: Approve (continuous-integration)

[Omer Akram (om26er)]

Looks good to me.

review: Approve

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2013-05-16 05:57:27 +0000
+++ autopilot/input/_uinput.py	2013-05-16 20:09:25 +0000
@@ -28,6 +28,7 @@
 import logging
 from time import sleep
 from evdev import UInput, ecodes as e
+import os.path
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +42,8 @@
 
     def __init__(self):
         super(Keyboard, self).__init__()
-        self._device = UInput(devnode='/dev/autopilot-uinput')
+
+        self._device = UInput(devnode=_get_devnode_path())
 
     def _emit(self, event, value):
         self._device.write(e.EV_KEY, event, value)
@@ -159,6 +161,14 @@
         return events
 
 
+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
+
+
 last_tracking_id = 0
 def get_next_tracking_id():
     global last_tracking_id
@@ -215,7 +225,7 @@
     }
 
     return UInput(cap_mt, name='autopilot-finger', version=0x2,
-                  devnode='/dev/autopilot-uinput')
+                  devnode=_get_devnode_path())
 
 _touch_device = create_touch_device()
 

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2013-05-15 10:13:42 +0000
+++ autopilot/tests/functional/test_input_stack.py	2013-05-16 20:09:25 +0000
@@ -41,8 +41,10 @@
 
     def setUp(self):
         super(InputStackKeyboardBase, self).setUp()
-        if self.backend == 'UInput' and not os.access('/dev/autopilot-uinput', os.W_OK):
-            raise SkipTest("UInput backend currently requires write access to /dev/autopilot-uinput")
+        if self.backend == 'UInput' and not (
+            os.access('/dev/autopilot-uinput', os.W_OK) or
+            os.access('/dev/uinput', os.W_OK)):
+            raise SkipTest("UInput backend currently requires write access to /dev/autopilot-uinput or /dev/uinput")
 
 
 class InputStackKeyboardCreationTests(InputStackKeyboardBase):