messaging-app

Merge lp:~barry/messaging-app/py3autopilot into lp:messaging-app

  1. py3autopilot
  2. Merge into trunk
Proposed by Barry Warsaw
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~barry/messaging-app/py3autopilot
Merge into: lp:messaging-app
Diff against target: 104 lines (+16/-10)
5 files modified
debian/changelog (+7/-0)
debian/control (+4/-4)
tests/CMakeLists.txt (+1/-1)
tests/autopilot/messaging_app/emulators.py (+2/-2)
tests/autopilot/messaging_app/tests/test_messaging.py (+2/-3)
To merge this branch: bzr merge lp:~barry/messaging-app/py3autopilot
Reviewer Review Type Date Requested Status
Leo Arias (community) Disapprove
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+222556@code.launchpad.net

Commit message

* Port autopilot tests to Python 3.
* Bump Standards-Version to 3.9.5.

Description of the change

  * Port autopilot tests to Python 3.
  * Bump Standards-Version to 3.9.5.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/219/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/710
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/165/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/849
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1436/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6807/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8258

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

review: Needs Fixing (continuous-integration)
lp:~barry/messaging-app/py3autopilot updated
113. By Barry Warsaw

trunk merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1039
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/936/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1825
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1825/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8636
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/809/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1079
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1079/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

A branch with the port to py3 is already on trunk, so this branch is no longer needed.
But thanks Barry.

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-06-17 23:12:42 +0000
+++ debian/changelog 2014-06-19 13:57:27 +0000
@@ -23,6 +23,13 @@
2323
24 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 09 Jun 2014 17:42:25 +000024 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 09 Jun 2014 17:42:25 +0000
2525
26messaging-app (0.1+14.10.20140530-0ubuntu2) UNRELEASED; urgency=medium
27
28 * Port autopilot tests to Python 3.
29 * Bump Standards-Version to 3.9.5.
30
31 -- Barry Warsaw <barry@ubuntu.com> Mon, 09 Jun 2014 16:00:32 -0400
32
26messaging-app (0.1+14.10.20140530-0ubuntu1) utopic; urgency=low33messaging-app (0.1+14.10.20140530-0ubuntu1) utopic; urgency=low
2734
28 [ CI bot ]35 [ CI bot ]
2936
=== modified file 'debian/control'
--- debian/control 2014-03-25 02:03:38 +0000
+++ debian/control 2014-06-19 13:57:27 +0000
@@ -5,13 +5,13 @@
5Build-Depends: cmake,5Build-Depends: cmake,
6 debhelper (>= 9),6 debhelper (>= 9),
7 dh-translations,7 dh-translations,
8 python-flake8,8 python3-flake8,
9 pkg-config,9 pkg-config,
10 python,10 python3,
11 qt5-default,11 qt5-default,
12 qtbase5-dev (>= 5.0),12 qtbase5-dev (>= 5.0),
13 qtdeclarative5-dev (>= 5.0),13 qtdeclarative5-dev (>= 5.0),
14Standards-Version: 3.9.414Standards-Version: 3.9.5
15Homepage: https://launchpad.net/messaging-app15Homepage: https://launchpad.net/messaging-app
16# If you aren't a member of ~phablet-team but need to upload packaging changes,16# If you aren't a member of ~phablet-team but need to upload packaging changes,
17# just go ahead. ~phablet-team will notice and sync up the code again.17# just go ahead. ~phablet-team will notice and sync up the code again.
@@ -39,7 +39,7 @@
39 libqt5test5,39 libqt5test5,
40 libqt5widgets5,40 libqt5widgets5,
41 messaging-app (>= ${binary:Version}),41 messaging-app (>= ${binary:Version}),
42 python-autopilot,42 python3-autopilot,
43 ubuntu-ui-toolkit-autopilot,43 ubuntu-ui-toolkit-autopilot,
44 ofono-phonesim-autostart,44 ofono-phonesim-autostart,
45Description: autopilot tests for messaging-app45Description: autopilot tests for messaging-app
4646
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2013-11-21 13:26:32 +0000
+++ tests/CMakeLists.txt 2014-06-19 13:57:27 +0000
@@ -1,6 +1,6 @@
1set(AUTOPILOT_DIR autopilot/messaging_app)1set(AUTOPILOT_DIR autopilot/messaging_app)
22
3execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"3execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
4 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)4 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
55
6install(DIRECTORY ${AUTOPILOT_DIR}6install(DIRECTORY ${AUTOPILOT_DIR}
77
=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py 2014-06-17 03:25:14 +0000
+++ tests/autopilot/messaging_app/emulators.py 2014-06-19 13:57:27 +0000
@@ -219,7 +219,7 @@
219 text_entry = self.get_newmessage_textarea()219 text_entry = self.get_newmessage_textarea()
220 self.pointing_device.click_object(text_entry)220 self.pointing_device.click_object(text_entry)
221 text_entry.focus.wait_for(True)221 text_entry.focus.wait_for(True)
222 time.sleep(.3)222 time.sleep(0.3)
223 self.keyboard.type(str(message), delay=0.2)223 self.keyboard.type(str(message), delay=0.2)
224 self.logger.info(224 self.logger.info(
225 'typed: "{}" expected: "{}"'.format(text_entry.text, message))225 'typed: "{}" expected: "{}"'.format(text_entry.text, message))
@@ -233,7 +233,7 @@
233 text_entry = self.get_newmessage_multirecipientinput()233 text_entry = self.get_newmessage_multirecipientinput()
234 self.pointing_device.click_object(text_entry)234 self.pointing_device.click_object(text_entry)
235 text_entry.focus.wait_for(True)235 text_entry.focus.wait_for(True)
236 time.sleep(.3)236 time.sleep(0.3)
237 self.keyboard.type(str(num_or_contact), delay=0.2)237 self.keyboard.type(str(num_or_contact), delay=0.2)
238 self.keyboard.press_and_release("Enter")238 self.keyboard.press_and_release("Enter")
239 self.logger.info(239 self.logger.info(
240240
=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
--- tests/autopilot/messaging_app/tests/test_messaging.py 2014-06-17 03:25:14 +0000
+++ tests/autopilot/messaging_app/tests/test_messaging.py 2014-06-19 13:57:27 +0000
@@ -9,8 +9,6 @@
99
10"""Tests for the Messaging App using ofono-phonesim"""10"""Tests for the Messaging App using ofono-phonesim"""
1111
12from __future__ import absolute_import
13
14import os12import os
15import subprocess13import subprocess
16import time14import time
@@ -34,7 +32,8 @@
34 try:32 try:
35 out = subprocess.check_output(33 out = subprocess.check_output(
36 ['/usr/share/ofono/scripts/list-modems'],34 ['/usr/share/ofono/scripts/list-modems'],
37 stderr=subprocess.PIPE35 stderr=subprocess.PIPE,
36 universal_newlines=True,
38 )37 )
39 have_phonesim = out.startswith('[ /phonesim ]')38 have_phonesim = out.startswith('[ /phonesim ]')
40 except subprocess.CalledProcessError:39 except subprocess.CalledProcessError:

Subscribers

People subscribed via source and target branches