Autopilot

Merge lp:~chris.gagnon/autopilot/add_press_duration_to_touch_devices into lp:autopilot

add_press_duration_to_touch_devices
Merge into trunk

Proposed by Chris Gagnon on 2014-03-22

Status:

Rejected

Rejected by:

Leo Arias on 2014-09-08

Proposed branch:

lp:~chris.gagnon/autopilot/add_press_duration_to_touch_devices

Merge into:

lp:autopilot

Diff against target:

214 lines (+133/-9)

3 files modified

autopilot/input/__init__.py (+4/-4)
autopilot/input/_uinput.py (+4/-4)
autopilot/tests/functional/test_input_stack.py (+125/-1)

To merge this branch:

bzr merge lp:~chris.gagnon/autopilot/add_press_duration_to_touch_devices

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Leo Arias (community)			Disapprove on 2014-09-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-23
Christopher Lee (community)		2014-03-22	Needs Fixing on 2014-03-27
Review via email: mp+212265@code.launchpad.net

Commit message

add press_duration to touch devices

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Christopher Lee (veebers) wrote on 2014-03-26:

Failing tests here are Pinch Gesture which is a known issue.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Christopher Lee (veebers) wrote on 2014-03-27:

These tests are failing:
- https://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6162/testReport/autopilot.tests.functional.test_input_stack/PointerClickTests/test_press_duration_1_second_with_touch_/
- https://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6162/testReport/autopilot.tests.functional.test_input_stack/PointerClickTests/test_press_duration_default_10_ms_with_touch_/

(The other test fails on the mako are known and being fixed)

review: Needs Fixing

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-03-27:

It looks like my test are failing for the same reason the other tests are failing.

File "/usr/lib/python2.7/dist-packages/autopilot/introspection/__init__.py", line 173, in get_proxy_object_for_existing_process
raise ProcessSearchError(message_string)
ProcessSearchError: Search criteria (pid = 3675, dbus bus = 'session', object path = '/com/canonical/Autopilot/Introspection', process object = '<subprocess.Popen object at 0xb448d150>') returned no results

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-03-27:

This works on my desktop and in my ubuntu-emulator.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-01:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-04-01:

My tests are passing here on mako

http://s-jenkins.ubuntu-ci:8080/job/generic-mediumtests-runner-mako/6297/testReport/autopilot.tests.functional.test_input_stack/PointerClickTests/

The failure was due to other tests outside the inputstack that failed

the otto tests failed because of otto

/var/log/upstart/otto-setup.log: The following packages have unmet dependencies:
/var/log/upstart/otto-setup.log: libcheese-gtk23 : Depends: libclutter-1.0-0 (>= 1.13.2) but it is not going to be installed
/var/log/upstart/otto-setup.log: Depends: libclutter-gtk-1.0-0 (>= 0.91.8) but it is not going to be installed
/var/log/upstart/otto-setup.log: Depends: libcogl15 (>= 1.15.8) but it is not going to be installed
/var/log/upstart/otto-setup.log: libcheese7 : Depends: libclutter-gst-2.0-0 (>= 0.10.0) but it is not going to be installed
/var/log/upstart/otto-setup.log: Depends: gstreamer1.0-clutter but it is not going to be installed
/var/log/upstart/otto-setup.log: libgoa-1.0-0b : Depends: libgoa-1.0-common (= 3.10.2-1) but 3.10.3-0ubuntu1 is to be installed
/var/log/upstart/otto-setup.log: ubuntu-system-settings : Depends: indicator-bluetooth (> 0.0.6+13.10.20131010) but it is not going to be installed
/var/log/upstart/otto-setup.log: E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-04-18:

My new test cases for press duration passed, however these unrelated tests failed

autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(increase size)
autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(decrease size)

lp:~chris.gagnon/autopilot/add_press_duration_to_touch_devices updated on 2014-04-22

463. By Chris Gagnon on 2014-04-22: resync with trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-04-23:

My new test cases for press duration passed

3 tests that are unrelated to my changes failed:

autopilot.tests.functional.test_ap_apps.QtTests.test_can_handle_non_unicode_stdout_and_stderr
autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(increase size)
autopilot.tests.functional.test_process_emulator.BAMFResizeWindowTestCase.test_resize_window_must_update_width_and_height_geometry(decrease size)

Revision history for this message

Leo Arias (elopio) wrote on 2014-09-08:

I copied this branch and finished with tests a little different. It's already merged in trunk.
Thanks Chris.

review: Disapprove

Unmerged revisions

463. By Chris Gagnon on 2014-04-22: resync with trunk
462. By Chris Gagnon on 2014-04-01: resync with trunk
461. By Chris Gagnon on 2014-03-27: fix extra_arg in desktop hint file
460. By Chris Gagnon on 2014-03-24: non-pep8 style changes for project, better names for tests
459. By Chris Gagnon on 2014-03-22: add press_duration to tap_object
458. By Chris Gagnon on 2014-03-22: add press_duration to touch devices

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Autopilot Hackers

Chris Gagnon

 === modified file 'autopilot/input/__init__.py'
 --- autopilot/input/__init__.py	2014-03-25 14:42:25 +0000
 +++ autopilot/input/__init__.py	2014-04-22 13:34:51 +0000
@@ -440,11 +440,11 @@
          """
          raise NotImplementedError("You cannot use this class directly.")
--    def tap(self, x, y):
++    def tap(self, x, y, press_duration=0.10):
          """Click (or 'tap') at given x,y coordinates."""
          raise NotImplementedError("You cannot use this class directly.")
--    def tap_object(self, object):
++    def tap_object(self, object, press_duration=0.10):
          """Tap the center point of a given object.
          It does this by looking for several attributes, in order. The first
@@ -610,7 +610,7 @@
              if button != 1:
                  raise ValueError(
                      "Touch devices do not have button %d" % (button))
--            self._device.tap(self._x, self._y)
++            self._device.tap(self._x, self._y, press_duration=press_duration)
      def move(self, x, y):
          """Moves the pointer to the specified coordinates.
@@ -646,7 +646,7 @@
          """
          self.move_to_object(object_proxy)
--        self.click(button, press_duration)
++        self.click(button, press_duration=press_duration)
      def move_to_object(self, object_proxy):
          """Attempts to move the pointer to 'object_proxy's centre point.
 === modified file 'autopilot/input/_uinput.py'
 --- autopilot/input/_uinput.py	2014-03-25 14:42:25 +0000
 +++ autopilot/input/_uinput.py	2014-04-22 13:34:51 +0000
@@ -465,7 +465,7 @@
      def pressed(self):
          return self._device.pressed
--    def tap(self, x, y):
++    def tap(self, x, y, press_duration=0.10):
          """Click (or 'tap') at given x and y coordinates.
          :raises RuntimeError: if the finger is already pressed.
@@ -474,10 +474,10 @@
          """
          _logger.debug("Tapping at: %d,%d", x, y)
          self._device.finger_down(x, y)
--        sleep(0.1)
++        sleep(press_duration)
          self._device.finger_up()
--    def tap_object(self, object_):
++    def tap_object(self, object_, press_duration=0.10):
          """Click (or 'tap') a given object.
          :raises RuntimeError: if the finger is already pressed.
@@ -488,7 +488,7 @@
          """
          _logger.debug("Tapping object: %r", object)
          x, y = get_center_point(object_)
--        self.tap(x, y)
++        self.tap(x, y, press_duration=press_duration)
      def press(self, x, y):
          """Press and hold a given object or at the given coordinates.
 === modified file 'autopilot/tests/functional/test_input_stack.py'
 --- autopilot/tests/functional/test_input_stack.py	2014-04-08 00:04:17 +0000
 +++ autopilot/tests/functional/test_input_stack.py	2014-04-22 13:34:51 +0000
@@ -22,7 +22,13 @@
  import os
  from tempfile import mktemp
  from testtools import TestCase, skipIf
--from testtools.matchers import IsInstance, Equals, raises
++from testtools.matchers import (
++    IsInstance,
++    Equals,
++    GreaterThan,
++    LessThan,
++    raises,
++)
  from textwrap import dedent
  from time import sleep
  from unittest import SkipTest
@@ -506,6 +512,124 @@
          self.assertThat(p.y, Equals(123))
++class PointerClickTests(AutopilotTestCase):
++
++    if platform.model() == 'Desktop':
++        scenarios = [('with mouse', dict(input_device_class=Mouse))]
++    else:
++        scenarios = [('with touch', dict(input_device_class=Touch))]
++
++    test_qml = dedent("""\
++        import QtQuick 2.0
++        import Ubuntu.Components 0.1
++
++        Rectangle {
++            id: rectangle
++            width: 250
++            height: 250
++
++            property int milliseconds: 0
++            Column {
++                spacing: 2
++                Rectangle {
++                    width: 50
++                    height: 50
++                    Timer {
++                        id: timer
++                        //interval seems to be about 10 msec
++                        interval: 1
++                        running: false
++                        repeat: true
++                        onTriggered: timer.runtime()
++
++                        function runtime() {
++                            milliseconds = milliseconds+1
++                            time.text = milliseconds
++                        }
++                    }
++
++                    Text {
++                        id: time
++                        objectName: "time"
++                    }
++
++                }
++                Rectangle {
++                    width: 50
++                    height: 50
++                    Button {
++                        id: clickMeButton
++                        objectName: "clickMeButton"
++                        text: "Click Me"
++
++                        onPressedChanged: {
++                            if (clickMeButton.pressed == true) {
++                               milliseconds = 0
++                               timer.start()
++                            }
++                            if (clickMeButton.pressed == false) {
++                                timer.stop()
++                            }
++                        }
++                    }
++                }
++            }
++        }
++        """)
++
++    def _start_qml_script(self, script_contents):
++        """Launch a qml script."""
++        qml_path = mktemp(suffix='.qml')
++        open(qml_path, 'w').write(script_contents)
++        self.addCleanup(os.remove, qml_path)
++
++        extra_args = ''
++
++        if platform.model() != 'Desktop':
++            # We need to add the desktop-file-hint
++            desktop_file = self.useFixture(
++                TempDesktopFile()
++            ).get_desktop_file_path()
++            extra_args = '--desktop_file_hint={}'.format(desktop_file)
++
++        return self.launch_test_application(
++            "qmlscene",
++            "-qt=qt5",
++            qml_path,
++            extra_args,
++            app_type='qt',
++        )
++
++    def setUp(self):
++        self.app = self._start_qml_script(self.test_qml)
++        self.button = self.app.select_single(
++            'Button',
++            objectName='clickMeButton',
++        )
++        self.timer_text = self.app.wait_select_single(
++            '*',
++            objectName='time',
++        )
++
++        super(PointerClickTests, self).setUp()
++
++    @property
++    def pointer(self):
++        """ Return pointer """
++        return Pointer(self.input_device_class.create())
++
++    def test_press_duration_1_second(self):
++        self.pointer.click_object(self.button, press_duration=1)
++        # give a couple second for slow emulators to respond
++        self.assertThat(int(self.timer_text.text), LessThan(400))
++        # verify it's much higher than the default time
++        self.assertThat(int(self.timer_text.text), GreaterThan(98))
++
++    def test_press_duration_default_10_ms(self):
++        self.pointer.click_object(self.button)
++        self.assertThat(int(self.timer_text.text), LessThan(11))
++
++
  class InputStackCleanupTests(TestCase):
      def test_cleanup_called(self):

Autopilot

Merge lp:~chris.gagnon/autopilot/add_press_duration_to_touch_devices into lp:autopilot

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers