Merge lp:~autopilot/autopilot/fix-test-failures into lp:autopilot

[Thomi Richards]

Fix failing tests.

Fix autopilot test suite failures.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:291
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~autopilot/autopilot/fix-test-failures/+merge/176561/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/autopilot-ci/171/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/99

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

review: Needs Fixing (continuous-integration)

[lp:~autopilot/autopilot/fix-test-failures]

292. By Thomi Richards on 2013-07-24

fix pep8

293. By Thomi Richards on 2013-07-24

Link bug report.

[Christopher Lee (veebers)]

Looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2013-07-14 07:08:12 +0000
+++ autopilot/input/_uinput.py	2013-07-24 02:38:25 +0000
@@ -38,16 +38,21 @@
 _PRESSED_KEYS = []
 
 
+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
+
+
 class Keyboard(KeyboardBase):
 
-    def __init__(self):
-        super(Keyboard, self).__init__()
-
-        self._device = UInput(devnode=_get_devnode_path())
+    _device = UInput(devnode=_get_devnode_path())
 
     def _emit(self, event, value):
-        self._device.write(e.EV_KEY, event, value)
-        self._device.syn()
+        Keyboard._device.write(e.EV_KEY, event, value)
+        Keyboard._device.syn()
 
     def _sanitise_keys(self, keys):
         if keys == '+':
@@ -91,14 +96,12 @@
         """
         if not isinstance(keys, basestring):
             raise TypeError("'keys' argument must be a string.")
-        # logger.debug("Releasing keys %r with delay %f", keys, delay)
-        # # release keys in the reverse order they were pressed in.
-        # keys = self.__translate_keys(keys)
+
         for key in reversed(self._sanitise_keys(keys)):
             for event in Keyboard._get_events_for_key(key):
                 logger.debug("Releasing %s (%r)", key, event)
-                if key in _PRESSED_KEYS:
-                    _PRESSED_KEYS.remove(key)
+                if event in _PRESSED_KEYS:
+                    _PRESSED_KEYS.remove(event)
                 self._emit(event, RELEASE)
                 sleep(delay)
 
@@ -144,11 +147,10 @@
         global _PRESSED_KEYS
         if len(_PRESSED_KEYS) == 0:
             return
-        _device = UInput(devnode=_get_devnode_path())
 
         def _release(event):
-            _device.write(e.EV_KEY, event, RELEASE)
-            _device.syn()
+            Keyboard._device.write(e.EV_KEY, event, RELEASE)
+            Keyboard._device.syn()
         for event in _PRESSED_KEYS:
             logger.warning("Releasing key %r as part of cleanup call.", event)
             _release(event)
@@ -173,14 +175,6 @@
         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
 
 

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2013-07-23 04:04:43 +0000
+++ autopilot/tests/functional/test_input_stack.py	2013-07-24 02:38:25 +0000
@@ -85,7 +85,11 @@
         from autopilot.introspection.qt import QtApplicationLauncher
         return QtApplicationLauncher()
 
-    def test_some_text(self):
+    def test_text_typing(self):
+        """Typing text must produce the correct characters in the target
+        app.
+
+        """
         app_proxy = self.start_mock_app()
         text_edit = app_proxy.select_single('QTextEdit')
 
@@ -96,7 +100,40 @@
         keyboard = Keyboard.create(self.backend)
         keyboard.type(self.input, 0.01)
 
-        self.assertThat(text_edit.plainText, Eventually(Equals(self.input)))
+        self.assertThat(text_edit.plainText,
+                        Eventually(Equals(self.input)),
+                        "app shows: " + text_edit.plainText
+                        )
+
+    def test_keyboard_keys_are_released(self):
+        """Typing characters must not leave keys pressed."""
+        app_proxy = self.start_mock_app()
+        text_edit = app_proxy.select_single('QTextEdit')
+
+        # make sure the text edit has keyboard focus:
+        self.mouse.click_object(text_edit)
+        keyboard = Keyboard.create(self.backend)
+
+        for character in self.input:
+            self.assertThat(self._get_pressed_keys_list(), Equals([]))
+            keyboard.type(character, 0.01)
+            self.assertThat(self._get_pressed_keys_list(), Equals([]))
+
+    def _get_pressed_keys_list(self):
+        """Get a list of keys pressed, but not released from the backend we're
+        using.
+
+        """
+        if self.backend == 'X11':
+            from autopilot.input._X11 import _PRESSED_KEYS
+            return _PRESSED_KEYS
+        elif self.backend == 'UInput':
+            from autopilot.input._uinput import _PRESSED_KEYS
+            return _PRESSED_KEYS
+        else:
+            self.fail("Don't know how to get pressed keys list for backend "
+                      + self.backend
+                      )
 
 
 class MouseTestCase(AutopilotTestCase):
@@ -118,11 +155,10 @@
 
         """
         expected_exception = RuntimeError(
-            "Cannot create a mouse on the phablet devices."
+            "Cannot create a Mouse on the phablet devices."
         )
         self.assertThat(lambda: Mouse.create(),
-            raises(expected_exception))
-
+                        raises(expected_exception))
 
 
 class TouchTests(AutopilotTestCase):
@@ -177,15 +213,15 @@
         self.assertThat(device._y, Equals(56))
 
     def test_touch_drag_updates_coordinates(self):
-        """The Pointer wrapper must update it's x and y properties when wrapping
-        a touch object and performing a drag operation.
+        """The Pointer wrapper must update it's x and y properties when
+        wrapping a touch object and performing a drag operation.
 
         """
         class FakeTouch(Touch):
             def __init__(self):
                 pass
 
-            def drag(self, x1,y1,x2,y2):
+            def drag(self, x1, y1, x2, y2):
                 pass
 
         p = Pointer(FakeTouch())

=== modified file 'autopilot/tests/unit/test_platform.py'
--- autopilot/tests/unit/test_platform.py	2013-07-22 03:27:40 +0000
+++ autopilot/tests/unit/test_platform.py	2013-07-24 02:38:25 +0000
@@ -30,10 +30,14 @@
 
 class PlatformDetectorTests(TestCase):
 
-    def tearDown(self):
-        super(PlatformDetectorTests, self).tearDown()
-        # platform detector is cached, so destroy the cache at the end of each
-        # test:
+    def setUp(self):
+        super(PlatformDetectorTests, self).setUp()
+        # platform detector is cached, so make sure we destroy the cache before
+        # each test runs, and after each test completes.
+        self._destroy_platform_detector_cache()
+        self.addCleanup(self._destroy_platform_detector_cache)
+
+    def _destroy_platform_detector_cache(self):
         platform._PlatformDetector._cached_detector = None
 
     def test_platform_detector_is_cached(self):