Merge lp:~elopio/ubuntu-autopilot-tests/skip_dialer into lp:ubuntu-autopilot-tests/ubuntu-experience-tests

[Leo Arias]

Ported package to python3.
removed dialer tests for now, because it is python2.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM, with the exception of the diff comment.

[lp:~elopio/ubuntu-autopilot-tests/skip_dialer]

24. By Leo Arias on 2014-06-19

Fixed the last debian/control bits.

25. By Leo Arias on 2014-06-19

Removed temporarily the dialer test. Will be readded once the py3 branch lands.

[Chris Gagnon (chris.gagnon)]

lgtm

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-05-26 12:08:36 +0000
+++ debian/control	2014-06-19 20:59:39 +0000
@@ -3,27 +3,23 @@
 Priority: optional
 Maintainer: Ubuntu Quality Team <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0),
-               python,
-               python-flake8,
-               python-setuptools,
-               python-support (>= 0.90),
+               dh-python,
+               python3-all,
+               python3-flake8,
 Standards-Version: 3.9.5
-X-Python-Version: >= 2.7
 Homepage: https://launchpad.net/ubuntu-autopilot-tests/
-# if you don't have have commit access to this branch but would like to upload
-# directly to Ubuntu, don't worry: your changes will be merged back into the
-# upstream branch
-Vcs-bzr: lp:ubuntu-autopilot-tests/ubuntu-integration-tests
+Vcs-bzr: lp:ubuntu-autopilot-tests/ubuntu-experience-tests
+X-Python3-Version: >= 3.2
 
 Package: ubuntu-experience-tests
 Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         python-autopilot,
-         dialer-app-autopilot ( >= 0.1+14.04.20140130-0ubuntu1),
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends},
+         python3-autopilot,
          ubuntu-ui-toolkit-autopilot,
          unity8-autopilot,
          url-dispatcher-tools,
-Description: Ubuntu Autopilot Testcases
+Description: Ubuntu user experience Autopilot tests
  This package provides a set of autopilot tests for testing
  the inter-app integration under Unity8

=== modified file 'debian/rules'
--- debian/rules	2014-03-27 17:39:27 +0000
+++ debian/rules	2014-06-19 20:59:39 +0000
@@ -1,13 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --fail-missing
+	dh $@ --fail-missing --with python3 --buildsystem pybuild
 
 override_dh_auto_test:
 	flake8 ubuntu_experience_tests/

=== removed file 'debian/ubuntu-experience-tests.install'
--- debian/ubuntu-experience-tests.install	2014-03-10 13:15:57 +0000
+++ debian/ubuntu-experience-tests.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ubuntu_experience_tests usr/lib/python2.7/dist-packages/

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2014-06-19 20:59:39 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+# Copyright 2014 Canonical Ltd.
+#
+# This file is part of ubuntu-experience-tests.
+#
+# This program 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.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses
+
+import setuptools
+
+
+VERSION = '1.0'
+
+
+setuptools.setup(
+    name='ubuntu_experience_tests',
+    version=VERSION,
+    description='Ubuntu user experience Autopilot tests.',
+    author='Ubuntu Engineering QA Team',
+    author_email='[e-mail]',
+    url='https://launchpad.net/ubuntu-autopilot-tests/ubuntu-experience-tests',
+    license='GPLv3',
+    packages=setuptools.find_packages(),
+    test_suite='ubuntu_experience_tests.tests',
+)

=== removed file 'ubuntu_experience_tests/tests/test_osd_dialer_integration.py'
--- ubuntu_experience_tests/tests/test_osd_dialer_integration.py	2014-05-29 09:20:31 +0000
+++ ubuntu_experience_tests/tests/test_osd_dialer_integration.py	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright 2014 Canonical Ltd.
-# Author: Omer Akram <[e-mail]>
-#
-# This file is part of ubuntu-experience-tests.
-#
-# This program 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.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>
-
-import subprocess
-
-from autopilot.matchers import Eventually
-from autopilot import platform
-from dialer_app import helpers as dialer_helpers
-from testtools.matchers import Equals
-from ubuntu_experience_tests import helpers, tests
-
-
-class DialerNotificationTestCase(tests.UbuntuExperienceTestCase):
-
-    def setUp(self):
-        if platform.model() == 'Desktop':
-            self.skipTest('The tests is not running on a phone.')
-        if not dialer_helpers.is_phonesim_running():
-            self.skipTest('ofono-phonesim is not running.')
-
-        super(DialerNotificationTestCase, self).setUp()
-        self.addCleanup(
-            subprocess.call, ['/usr/share/ofono/scripts/hangup-all']
-        )
-        subprocess.call(
-            ['mc-tool', 'update', 'ofono/ofono/account0',
-             'string:modem-objpath=/phonesim'])
-        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
-
-    def _get_accept_button(self, unity):
-        return unity.select_single(objectName='button0', visible=True)
-
-    def _get_decline_button(self, unity):
-        return unity.select_single(objectName='button1', visible=True)
-
-    def _accept_call_from_ui(self):
-        accept_button = self._get_accept_button(self.unity_proxy)
-
-        self.pointing_device.click_object(accept_button)
-
-    def test_unity_accept_button_open_dialer(self):
-        """Ensure tapping on 'accept' button in the OSD notification
-        opens up the dialer-app in live call.
-
-        """
-        dialer_helpers.invoke_incoming_call()
-        dialer_helpers.wait_for_incoming_call()
-        self._accept_call_from_ui()
-
-        dialer = helpers.get_proxy_object_by_process_name('dialer-app')
-        dialer_main_view = dialer.wait_select_single("QQuickView")
-        live_call = dialer.wait_select_single(objectName='pageLiveCall')
-
-        self.assertThat(dialer_main_view.visible, Eventually(Equals(True)))
-        self.assertThat(live_call.visible, Eventually(Equals(True)))