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

Proposed by Barry Warsaw on 2014-05-22
Status: Superseded
Proposed branch: lp:~barry/dialer-app/py3autopilot
Merge into: lp:dialer-app
Diff against target: 149 lines (+12/-17)
7 files modified
debian/control (+4/-2)
debian/rules (+4/-1)
tests/CMakeLists.txt (+1/-1)
tests/autopilot/dialer_app/helpers.py (+1/-2)
tests/autopilot/dialer_app/tests/test_calls.py (+0/-2)
tests/autopilot/dialer_app/tests/test_dialer.py (+0/-5)
tests/autopilot/dialer_app/tests/test_logs.py (+2/-4)
To merge this branch: bzr merge lp:~barry/dialer-app/py3autopilot
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2014-07-23
Leo Arias (community) Needs Fixing on 2014-05-28
Dimitri John Ledkov 2014-05-22 Needs Fixing on 2014-05-22
Review via email: mp+220658@code.launchpad.net

This proposal has been superseded by a proposal from 2014-07-30.

Commit message

Port to python3-autopilot

Description of the change

Port to python3-autopilot

To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

8 - python:any,
9 + python3-all,

Should be "python3:any", or "python3-all:any".

Should call dh_python3 helper.

Should install tests in python3 path.

review: Needs Fixing
lp:~barry/dialer-app/py3autopilot updated on 2014-05-22
135. By Barry Warsaw on 2014-05-22

Fixes from xnox

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~barry/dialer-app/py3autopilot updated on 2014-05-27
136. By Barry Warsaw on 2014-05-27

trunk merge

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Leo Arias (elopio) wrote :

Now the tests are failing with ImportError: No module named 'exceptions'

review: Needs Fixing
lp:~barry/dialer-app/py3autopilot updated on 2014-05-28
137. By Barry Warsaw on 2014-05-28

Remove unnecessary import.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Leo Arias (elopio) wrote :

I tested this on my utopic and it works without issues. I don't understand what can be failing now on Jenkins.

Barry Warsaw (barry) wrote :

On May 30, 2014, at 09:34 AM, Leo Arias wrote:

>I tested this on my utopic and it works without issues. I don't understand
>what can be failing now on Jenkins.

IME, that's not an uncommon situation unfortunately. ;)

lp:~barry/dialer-app/py3autopilot updated on 2014-06-09
138. By Barry Warsaw on 2014-06-06

trunk merge

139. By Barry Warsaw on 2014-06-09

trunk merge

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~barry/dialer-app/py3autopilot updated on 2014-06-16
140. By Barry Warsaw on 2014-06-16

trunk merge

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Leo Arias (elopio) wrote :

It's likely that the previous error while installing ofono was fixed by Francis. But this now needs a merge with trunk. I'm sorry Barry, but can you give it another try?

lp:~barry/dialer-app/py3autopilot updated on 2014-06-20
141. By Barry Warsaw on 2014-06-20

trunk merge

Barry Warsaw (barry) wrote :

On Jun 20, 2014, at 12:07 AM, Leo Arias wrote:

>It's likely that the previous error while installing ofono was fixed by
>Francis. But this now needs a merge with trunk. I'm sorry Barry, but can you
>give it another try?

Trunk merged and pushed.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Leo Arias (elopio) wrote :

Ok, one single failure. I'll dig into this. Thanks Barry.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Brendan Donegan (brendan-donegan) wrote :

I can reproduce those failures, plus some other ones.

lp:~barry/dialer-app/py3autopilot updated on 2014-07-22
142. By Barry Warsaw on 2014-07-22

trunk merge

Barry Warsaw (barry) wrote :

On Jul 22, 2014, at 10:55 AM, Brendan Donegan wrote:

>I can reproduce those failures, plus some other ones.

I just merged trunk for both this and address-book-app, and pushed branch
updates. Let's see what happens.

lp:~barry/dialer-app/py3autopilot updated on 2014-07-23
143. By Barry Warsaw on 2014-07-23

trunk merge

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~barry/dialer-app/py3autopilot updated on 2014-08-08
144. By Barry Warsaw on 2014-07-30

trunk merge

145. By Barry Warsaw on 2014-07-31

trunk merge

146. By Barry Warsaw on 2014-08-01

trunk merge

147. By Barry Warsaw on 2014-08-01

Simplify some super() calls.

148. By Barry Warsaw on 2014-08-01

Try to fix failing test.

149. By Barry Warsaw on 2014-08-01

Revert that last change.

150. By Barry Warsaw on 2014-08-04

trunk merge

151. By Barry Warsaw on 2014-08-04

On the autopilot test, sleep before hanging up.

152. By Barry Warsaw on 2014-08-08

trunk merge

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-06-16 16:36:37 +0000
3+++ debian/control 2014-07-30 16:05:14 +0000
4@@ -6,7 +6,8 @@
5 debhelper (>= 9),
6 dh-translations,
7 pkg-config,
8- python:any,
9+ python3-all:any,
10+ dh-python,
11 qt5-default,
12 qtbase5-dev (>= 5.0),
13 qtdeclarative5-dev (>= 5.0),
14@@ -35,13 +36,14 @@
15 Architecture: all
16 Section: debug
17 Depends: ${misc:Depends},
18+ ${python3:Depends},
19 autopilot-qt5,
20 dbus,
21 libqt5test5,
22 libqt5widgets5,
23 dialer-app (>= ${binary:Version}),
24 ofono-scripts,
25- python-autopilot,
26+ python3-autopilot,
27 ubuntu-ui-toolkit-autopilot,
28 ofono-phonesim-autostart,
29 messaging-app,
30
31=== modified file 'debian/rules'
32--- debian/rules 2013-08-22 10:58:07 +0000
33+++ debian/rules 2014-07-30 16:05:14 +0000
34@@ -7,7 +7,7 @@
35 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
36
37 %:
38- dh $@ --parallel --fail-missing --with translations
39+ dh $@ --parallel --fail-missing --with translations,python3
40
41 override_dh_auto_configure:
42 dh_auto_configure -- -DCMAKE_BUILD_TYPE=Debug
43@@ -20,3 +20,6 @@
44 # Unfortunately, the default build directory is not exposed
45 # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).
46 $(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) dialer-app.pot
47+
48+override_dh_python3:
49+ dh_python3 -pdialer-app-autopilot
50
51=== modified file 'tests/CMakeLists.txt'
52--- tests/CMakeLists.txt 2013-11-18 06:20:29 +0000
53+++ tests/CMakeLists.txt 2014-07-30 16:05:14 +0000
54@@ -1,6 +1,6 @@
55 set(AUTOPILOT_DIR autopilot/dialer_app)
56
57-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
58+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
59 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
60
61 install(DIRECTORY ${AUTOPILOT_DIR}
62
63=== modified file 'tests/autopilot/dialer_app/helpers.py'
64--- tests/autopilot/dialer_app/helpers.py 2014-06-13 21:52:17 +0000
65+++ tests/autopilot/dialer_app/helpers.py 2014-07-30 16:05:14 +0000
66@@ -21,7 +21,6 @@
67 import sys
68 import time
69 import dbus
70-import exceptions
71
72
73 def wait_for_incoming_call():
74@@ -96,7 +95,7 @@
75 break
76 time.sleep(1)
77 else:
78- raise exceptions.RuntimeError("oFono simulator didn't get online.")
79+ raise RuntimeError("oFono phone simulator didn't get online.")
80
81 # this is a bit drastic, but sometimes mission-control-5 won't recognize
82 # clients installed after it was started, so, we make sure it gets
83
84=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
85--- tests/autopilot/dialer_app/tests/test_calls.py 2014-06-13 21:52:17 +0000
86+++ tests/autopilot/dialer_app/tests/test_calls.py 2014-07-30 16:05:14 +0000
87@@ -10,8 +10,6 @@
88
89 """Tests for the Dialer App using ofono-phonesim"""
90
91-from __future__ import absolute_import
92-
93 import subprocess
94 import os
95 import time
96
97=== modified file 'tests/autopilot/dialer_app/tests/test_dialer.py'
98--- tests/autopilot/dialer_app/tests/test_dialer.py 2014-06-13 21:52:17 +0000
99+++ tests/autopilot/dialer_app/tests/test_dialer.py 2014-07-30 16:05:14 +0000
100@@ -9,8 +9,6 @@
101
102 """Tests for the Dialer App"""
103
104-from __future__ import absolute_import
105-
106 from autopilot.matchers import Eventually
107 from testtools.matchers import Equals
108
109@@ -20,9 +18,6 @@
110 class TestDialer(DialerAppTestCase):
111 """Tests for the Call panel."""
112
113- def setUp(self):
114- super(TestDialer, self).setUp()
115-
116 # FIXME: test disabled until we get a better way to test the keypad keys
117 # def test_keypad_buttons(self):
118 # keypad_entry = self.main_view.dialer_page._get_keypad_entry()
119
120=== modified file 'tests/autopilot/dialer_app/tests/test_logs.py'
121--- tests/autopilot/dialer_app/tests/test_logs.py 2014-07-15 18:31:15 +0000
122+++ tests/autopilot/dialer_app/tests/test_logs.py 2014-07-30 16:05:14 +0000
123@@ -10,8 +10,6 @@
124
125 """Tests for the Dialer App"""
126
127-from __future__ import absolute_import
128-
129 from autopilot.matchers import Eventually
130 from autopilot.platform import model
131 from testtools.matchers import Equals
132@@ -33,7 +31,6 @@
133 db_file = 'history.sqlite'
134 local_db_dir = 'dialer_app/data/'
135 system_db_dir = '/usr/lib/python2.7/dist-packages/dialer_app/data/'
136- devnull = open(os.devnull, 'w')
137
138 def setUp(self):
139 if os.path.exists('../../src/dialer-app'):
140@@ -43,7 +40,8 @@
141
142 subprocess.call(['pkill', 'history-daemon'])
143 os.environ['HISTORY_SQLITE_DBPATH'] = database
144- subprocess.Popen(['history-daemon'], stderr=self.devnull)
145+ with open(os.devnull, 'w') as devnull:
146+ subprocess.Popen(['history-daemon'], stderr=devnull)
147
148 super(TestCallLogs, self).setUp()
149 testability_environment = fixture_setup.TestabilityEnvironment()

Subscribers

People subscribed via source and target branches