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

Proposed by Barry Warsaw on 2014-06-09
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 on 2014-07-11
PS Jenkins bot continuous-integration Needs Fixing on 2014-06-19
Ubuntu Phablet Team 2014-06-09 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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~barry/messaging-app/py3autopilot updated on 2014-06-19
113. By Barry Warsaw on 2014-06-19

trunk merge

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-06-17 23:12:42 +0000
3+++ debian/changelog 2014-06-19 13:57:27 +0000
4@@ -23,6 +23,13 @@
5
6 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 09 Jun 2014 17:42:25 +0000
7
8+messaging-app (0.1+14.10.20140530-0ubuntu2) UNRELEASED; urgency=medium
9+
10+ * Port autopilot tests to Python 3.
11+ * Bump Standards-Version to 3.9.5.
12+
13+ -- Barry Warsaw <barry@ubuntu.com> Mon, 09 Jun 2014 16:00:32 -0400
14+
15 messaging-app (0.1+14.10.20140530-0ubuntu1) utopic; urgency=low
16
17 [ CI bot ]
18
19=== modified file 'debian/control'
20--- debian/control 2014-03-25 02:03:38 +0000
21+++ debian/control 2014-06-19 13:57:27 +0000
22@@ -5,13 +5,13 @@
23 Build-Depends: cmake,
24 debhelper (>= 9),
25 dh-translations,
26- python-flake8,
27+ python3-flake8,
28 pkg-config,
29- python,
30+ python3,
31 qt5-default,
32 qtbase5-dev (>= 5.0),
33 qtdeclarative5-dev (>= 5.0),
34-Standards-Version: 3.9.4
35+Standards-Version: 3.9.5
36 Homepage: https://launchpad.net/messaging-app
37 # If you aren't a member of ~phablet-team but need to upload packaging changes,
38 # just go ahead. ~phablet-team will notice and sync up the code again.
39@@ -39,7 +39,7 @@
40 libqt5test5,
41 libqt5widgets5,
42 messaging-app (>= ${binary:Version}),
43- python-autopilot,
44+ python3-autopilot,
45 ubuntu-ui-toolkit-autopilot,
46 ofono-phonesim-autostart,
47 Description: autopilot tests for messaging-app
48
49=== modified file 'tests/CMakeLists.txt'
50--- tests/CMakeLists.txt 2013-11-21 13:26:32 +0000
51+++ tests/CMakeLists.txt 2014-06-19 13:57:27 +0000
52@@ -1,6 +1,6 @@
53 set(AUTOPILOT_DIR autopilot/messaging_app)
54
55-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
56+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
57 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
58
59 install(DIRECTORY ${AUTOPILOT_DIR}
60
61=== modified file 'tests/autopilot/messaging_app/emulators.py'
62--- tests/autopilot/messaging_app/emulators.py 2014-06-17 03:25:14 +0000
63+++ tests/autopilot/messaging_app/emulators.py 2014-06-19 13:57:27 +0000
64@@ -219,7 +219,7 @@
65 text_entry = self.get_newmessage_textarea()
66 self.pointing_device.click_object(text_entry)
67 text_entry.focus.wait_for(True)
68- time.sleep(.3)
69+ time.sleep(0.3)
70 self.keyboard.type(str(message), delay=0.2)
71 self.logger.info(
72 'typed: "{}" expected: "{}"'.format(text_entry.text, message))
73@@ -233,7 +233,7 @@
74 text_entry = self.get_newmessage_multirecipientinput()
75 self.pointing_device.click_object(text_entry)
76 text_entry.focus.wait_for(True)
77- time.sleep(.3)
78+ time.sleep(0.3)
79 self.keyboard.type(str(num_or_contact), delay=0.2)
80 self.keyboard.press_and_release("Enter")
81 self.logger.info(
82
83=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
84--- tests/autopilot/messaging_app/tests/test_messaging.py 2014-06-17 03:25:14 +0000
85+++ tests/autopilot/messaging_app/tests/test_messaging.py 2014-06-19 13:57:27 +0000
86@@ -9,8 +9,6 @@
87
88 """Tests for the Messaging App using ofono-phonesim"""
89
90-from __future__ import absolute_import
91-
92 import os
93 import subprocess
94 import time
95@@ -34,7 +32,8 @@
96 try:
97 out = subprocess.check_output(
98 ['/usr/share/ofono/scripts/list-modems'],
99- stderr=subprocess.PIPE
100+ stderr=subprocess.PIPE,
101+ universal_newlines=True,
102 )
103 have_phonesim = out.startswith('[ /phonesim ]')
104 except subprocess.CalledProcessError:

Subscribers

People subscribed via source and target branches