dialer-app

HACKING (+45/-6)
README (+8/-0)
tests/CMakeLists.txt (+1/-8)
tests/autopilot/CMakeLists.txt (+13/-0)
tests/autopilot/dialer_app/ListItemWithActions.py (+2/-1)
tests/autopilot/dialer_app/__init__.py (+0/-10)
tests/autopilot/dialer_app/tests/__init__.py (+25/-38)
tests/autopilot/dialer_app/tests/test_calls.py (+2/-1)

To merge this branch:

bzr merge lp:~canonical-platform-qa/dialer-app/custom_proxy_objects

Related bugs:

Bug #1341681: Autopilot tests should stop using deprecated emulators module	Undecided	Fix Released
Bug #1356482: The project is missing the README file	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-03
Gustavo Pichorim Boiko (community)		2014-08-13	Approve on 2014-09-03
Nicholas Skaggs (community)			Approve on 2014-08-14
Chris Gagnon (community)		2014-08-13	Needs Fixing on 2014-08-14
Review via email: mp+230687@code.launchpad.net

Commit message

Stop using the deprecated emulators namespace.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/387/rebuild

review: Approve (continuous-integration)

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-08-14:

Looks good but can you fix the pep8 issues? (You didn't introduce them)

ListItemWithActions.py:37:1: E302 expected 2 blank lines, found 1
tests/test_calls.py:72:80: E501 line too long (86 > 79 characters)

If there were a lot I would ask for it to be fixed in a different MP, But it's only 2.

review: Needs Fixing

lp:~canonical-platform-qa/dialer-app/custom_proxy_objects updated on 2014-08-14

170. By Leo Arias on 2014-08-14: Fixed static errors.

Revision history for this message

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

> Looks good but can you fix the pep8 issues? (You didn't introduce them)
>
> ListItemWithActions.py:37:1: E302 expected 2 blank lines, found 1
> tests/test_calls.py:72:80: E501 line too long (86 > 79 characters)
>
> If there were a lot I would ask for it to be fixed in a different MP, But it's
> only 2.

Done. Thanks for the review.

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-08-14:

I know you wanted my feedback Leo; in general I am happy with this as-is. I still need to try it out with filemanager, which should happen tomorrow. But don't wait for me :-)

review: Approve

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/392/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/402/rebuild

review: Approve (continuous-integration)

lp:~canonical-platform-qa/dialer-app/custom_proxy_objects updated on 2014-09-02

171. By Leo Arias on 2014-09-02: Merged with trunk.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/433/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/dialer-app/custom_proxy_objects updated on 2014-09-02

172. By Leo Arias on 2014-09-02: Merged with prerequisite.

Revision history for this message

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

FAILED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/438/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4369
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5621
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12523
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3566
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3566/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/438/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-09-03:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Revision history for this message

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

FAILED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/440/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4372
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12529
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3569
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3569/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/440/rebuild

review: Needs Fixing (continuous-integration)

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:

Canonical Platform QA Team

Ishan Joshi

Ubuntu Phablet Team

 === modified file 'HACKING'
 --- HACKING	2013-11-13 06:22:09 +0000
 +++ HACKING	2014-09-02 23:04:44 +0000
@@ -1,5 +1,34 @@
++dialer-app hacking guide
++========================
++
++Getting dialer-app
++------------------
++
++To get the main development branch of dialer-app:
++
++    $ bzr branch lp:dialer-app
++
++
++Building the app
++----------------
++
++This app is built using cmake. Here's an example on how to build it:
++
++    $ cmake .
++    $ make -j 8
++
++
++Running the built app
++---------------------
++
++After building the app, it can be run with:
++
++    $ ./src/dialer-app
++
++
  Test coverage
  -------------
++
  dialer-app has autopilot tests which cover basic use cases like making an
  outgoing call and receiving an incoming call. They are integration tests which
  cover dialer-app itself, all the user session APIs below it (libofono-qt,
@@ -11,20 +40,30 @@
  The tests should run on both a desktop (like an Ubuntu desktop live session or
  Otto [http://launchpad.net/otto]) and a phone environment.
--How to run the tests
----------------------
++
++Running the autopilot tests with the installed app
++--------------------------------------------------
++
  The easiest and standard way across Ubuntu phablet packages is to install the
  dialer-app-autopilot package and run the tests from the system Python path:
--  sudo apt-get install dialer-app-autopilot
--  autopilot run dialer_app
++    $ sudo apt-get install dialer-app-autopilot
++    $ autopilot3 run dialer_app
  dialer-app-autopilot depends on ofono-phonesim-autostart to set up the
  simulated Modem automatically, and all the other additional test dependencies
  for autopilot. You can also run the tests right out of the source tree for
  development:
--  cd tests/autopilot
--  autopilot run dialer_app
++    $ cd tests/autopilot
++    $ autopilot3 run dialer_app
  (but you still need all the dialer-app-autopilot dependencies installed).
++
++
++Running the autopilot tests with the built app
++----------------------------------------------
++
++After building the app, the autopilot tests can be run with:
++
++    $ make test-autopilot
 === added file 'README'
 --- README	1970-01-01 00:00:00 +0000
 +++ README	2014-09-02 23:04:44 +0000
@@ -0,0 +1,8 @@
++dialer-app
++==========
++
++Dialer application for Ubuntu Touch.
++
++You can find information on how to compile and run this program in
++the HACKING file, and you can find licensing information in the
++COPYING files.
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2014-05-22 14:25:18 +0000
 +++ tests/CMakeLists.txt	2014-09-02 23:04:44 +0000
@@ -1,8 +1,1 @@
--set(AUTOPILOT_DIR autopilot/dialer_app)
--
--execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
--    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
--
--install(DIRECTORY ${AUTOPILOT_DIR}
--    DESTINATION ${PYTHON_PACKAGE_DIR}
--    )
++add_subdirectory(autopilot)
 === added file 'tests/autopilot/CMakeLists.txt'
 --- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/CMakeLists.txt	2014-09-02 23:04:44 +0000
@@ -0,0 +1,13 @@
++set(AUTOPILOT_DIR dialer_app)
++
++execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
++    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++
++install(DIRECTORY ${AUTOPILOT_DIR}
++    DESTINATION ${PYTHON_PACKAGE_DIR}
++    )
++
++add_custom_target(test-autopilot
++    BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
++    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++)
 === modified file 'tests/autopilot/dialer_app/ListItemWithActions.py'
 --- tests/autopilot/dialer_app/ListItemWithActions.py	2014-09-02 23:04:44 +0000
 +++ tests/autopilot/dialer_app/ListItemWithActions.py	2014-09-02 23:04:44 +0000
@@ -7,7 +7,7 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--"""Dialer app autopilot emulators."""
++"""Dialer app autopilot custom proxy objects."""
  from ubuntuuitoolkit._custom_proxy_objects import _common
@@ -23,6 +23,7 @@
          self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
++
  class HistoryDelegate(ListItemWithActions):
      """Autopilot helper for the History delegate."""
 === renamed file 'tests/autopilot/dialer_app/emulators.py' => 'tests/autopilot/dialer_app/__init__.py'
 --- tests/autopilot/dialer_app/emulators.py	2014-08-08 15:01:33 +0000
 +++ tests/autopilot/dialer_app/__init__.py	2014-09-02 23:04:44 +0000
@@ -1,5 +1,5 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--# Copyright 2013 Canonical
++# Copyright 2013, 2014 Canonical
+ #
  # This file is part of dialer-app.
+ #
@@ -7,14 +7,15 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--"""Dialer app autopilot emulators."""
++"""Dialer app autopilot custom proxy objects."""
--from autopilot.introspection.dbus import StateNotFoundError
--from ubuntuuitoolkit import emulators as toolkit_emulators
  import logging
--
--class MainView(toolkit_emulators.MainView):
++import ubuntuuitoolkit
++from autopilot import exceptions as autopilot_exceptions
++
++
++class MainView(ubuntuuitoolkit.MainView):
      def __init__(self, *args):
          super().__init__(*args)
          self.logger = logging.getLogger(__name__)
@@ -56,16 +57,17 @@
  class PageWithBottomEdge(MainView):
--    """An emulator class that makes it easy to interact with the bottom edge
--       swipe page"""
++
++    """Autopilot custom proxy object for PageWithBottomEdge components."""
      def reveal_bottom_edge_page(self):
          """Bring the bottom edge page to the screen"""
          self.bottomEdgePageLoaded.wait_for(True)
          try:
              action_item = self.wait_select_single(objectName='bottomEdgeTip')
--            start_x = (action_item.globalRect.x +
--                      (action_item.globalRect.width * 0.5))
++            start_x = (
++                action_item.globalRect.x +
++                (action_item.globalRect.width * 0.5))
              # Start swiping from the top of the component because after some
              # seconds it gets almost fully hidden. The center will be out of
              # view.
@@ -74,7 +76,7 @@
              self.pointing_device.drag(start_x, start_y, start_x, stop_y,
                                        rate=2)
              self.isReady.wait_for(True)
--        except StateNotFoundError:
++        except autopilot_exceptions.StateNotFoundError:
              self.logger.error('BottomEdge element not found.')
              raise
 === removed file 'tests/autopilot/dialer_app/__init__.py'
 --- tests/autopilot/dialer_app/__init__.py	2013-07-16 14:05:40 +0000
 +++ tests/autopilot/dialer_app/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
--# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--# Copyright 2012 Canonical
--#
--# This file is part of dialer-app.
--#
--# dialer-app is free software: you can redistribute it and/or modify it
--# under the terms of the GNU General Public License version 3, as published
--# by the Free Software Foundation.
--
--"""Marumbi autopilot tests and emulators - top level package."""
 === modified file 'tests/autopilot/dialer_app/tests/__init__.py'
 --- tests/autopilot/dialer_app/tests/__init__.py	2014-09-02 23:04:44 +0000
 +++ tests/autopilot/dialer_app/tests/__init__.py	2014-09-02 23:04:44 +0000
@@ -1,5 +1,5 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--# Copyright 2012, 2013 Canonical
++# Copyright 2012, 2013, 2014 Canonical
+ #
  # This file is part of dialer-app.
+ #
@@ -9,21 +9,19 @@
  """Dialer App autopilot tests."""
++import logging
++import os
++
  import fixtures
--from autopilot.input import Mouse, Touch, Pointer
++import ubuntuuitoolkit
  from autopilot.matchers import Eventually
--from autopilot.platform import model
  from autopilot.testcase import AutopilotTestCase
  from testtools.matchers import Equals
--from ubuntuuitoolkit import (
--    emulators as toolkit_emulators,
--    fixture_setup
--)
--from dialer_app import emulators
++from ubuntuuitoolkit import fixture_setup
++
++import dialer_app
  from dialer_app import helpers
--import os
--import logging
  logger = logging.getLogger(__name__)
@@ -39,27 +37,13 @@
      """
--    if model() == 'Desktop':
--        scenarios = [
--            ('with mouse', dict(input_device_class=Mouse)),
--        ]
--    else:
--        scenarios = [
--            ('with touch', dict(input_device_class=Touch)),
--        ]
--
--    local_location = "../../src/dialer-app"
++    LOCAL_BINARY_PATH = 'src/dialer-app'
++    # The path to the locally built binary, relative to the build directory.
      def setUp(self):
--        self.pointing_device = Pointer(self.input_device_class.create())
          super().setUp()
--
          self.set_up_locale()
--
--        if os.path.exists(self.local_location):
--            self.launch_test_local()
--        else:
--            self.launch_test_installed()
++        self.launch_application()
          self.assertThat(self.main_view.visible, Eventually(Equals(True)))
@@ -73,24 +57,27 @@
              fixture_setup.InitctlEnvironmentVariable(LANGUAGE='en')
+         )
--    def launch_test_local(self):
++    def launch_application(self):
++        build_dir = os.environ.get('BUILD_DIR', None)
++        if build_dir is not None:
++            self.launch_built_application(build_dir)
++        else:
++            self.launch_installed_application()
++
++    def launch_built_application(self, build_dir):
++        binary_path = os.path.join(build_dir, self.LOCAL_BINARY_PATH)
          self.app = self.launch_test_application(
--            self.local_location,
++            binary_path,
              app_type='qt',
--            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
++            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
+         )
--    def launch_test_installed(self):
++    def launch_installed_application(self):
          self.app = self.launch_upstart_application(
              'dialer-app',
--            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
--        )
--
--    def _click_object(self, objectName):
--        self.pointing_device.click_object(
--            self.app.wait_select_single(objectName=objectName)
++            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
+         )
      @property
      def main_view(self):
--        return self.app.wait_select_single(emulators.MainView)
++        return self.app.wait_select_single(dialer_app.MainView)
 === modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
 --- tests/autopilot/dialer_app/tests/test_calls.py	2014-08-26 13:35:46 +0000
 +++ tests/autopilot/dialer_app/tests/test_calls.py	2014-09-02 23:04:44 +0000
@@ -69,7 +69,8 @@
      def get_history_for_number(self, number):
          # because of the bottom edge tree structure, multiple copies of the
          # same item are returned, so just use the first one
--        return self.history_list.select_many("HistoryDelegate", phoneNumber=number)[0]
++        return self.history_list.select_many(
++            "HistoryDelegate", phoneNumber=number)[0]
      def test_outgoing_noanswer(self):
          """Outgoing call to a normal number, no answer"""

dialer-app

Merge lp:~canonical-platform-qa/dialer-app/custom_proxy_objects into lp:dialer-app

Commit message

Description of the change

Preview Diff

Subscribers