messaging-app

Merge lp:~brendan-donegan/messaging-app/python3_autopilot into lp:messaging-app

python3_autopilot
Merge into trunk

Proposed by Brendan Donegan on 2014-06-13

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2014-07-08
Approved revision:	113
Merged at revision:	135
Proposed branch:	lp:~brendan-donegan/messaging-app/python3_autopilot
Merge into:	lp:messaging-app
Diff against target:	52 lines (+5/-5) 3 files modified debian/control (+2/-2) tests/CMakeLists.txt (+1/-1) tests/autopilot/messaging_app/tests/test_messaging.py (+2/-2)
To merge this branch:	bzr merge lp:~brendan-donegan/messaging-app/python3_autopilot
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2014-06-13	Approve on 2014-07-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-08
Martin Pitt		2014-07-01	Approve on 2014-07-02
Review via email: mp+223041@code.launchpad.net

Commit message

Convert autopilot tests to use python3

Description of the change

Fixes a small issue that allows the messaging-app tests to be run in autopilot3 and updates the packaging so that they are install in the python3 path.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-16:

FAILED: Continuous integration, rev:109
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brendan-donegan/messaging-app/python3_autopilot/+merge/223041/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-16:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-18:

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

review: Needs Fixing (continuous-integration)

lp:~brendan-donegan/messaging-app/python3_autopilot updated on 2014-06-26

110. By Brendan Donegan on 2014-06-26: Merged from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-26:

FAILED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/244/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1244/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1243/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2014-06-30:

Are there any related MPs required for this MP to build/function as expected? Please list.

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

Yes

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

Yes, on the device

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?

N/A? Only test code is changed here

If you changed the UI, was the change specified/approved by design?

N/A, no UI changes

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

Need to find a core-dev. Not able to subscribe anyone.

lp:~brendan-donegan/messaging-app/python3_autopilot updated on 2014-06-30

111. By Brendan Donegan on 2014-06-30: Merged from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Martin Pitt (pitti) wrote on 2014-07-02:

packaging change ack from core-dev.

review: Approve

Revision history for this message

I Ahmad (iahmad) wrote on 2014-07-05:

it seems 'make install' from tests folder still copying the files to python2.7 dist-packages folder. You may need to update debian/messaging-app-autopilot.install ?

Revision history for this message

I Ahmad (iahmad) wrote on 2014-07-05:

Ah wrong copy/paste. Not debian/messaging-app-autopilot.install but CMakeLists.txt?

> it seems 'make install' from tests folder still copying the files to python2.7
> dist-packages folder. You may need to update debian/messaging-app-
> autopilot.install ?

lp:~brendan-donegan/messaging-app/python3_autopilot updated on 2014-07-06

112. By Brendan Donegan on 2014-07-06: Modify CMakeLists.txt to install in python3 dist-packages

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2014-07-06:

You're absolutely right - I had to edit CMakeLists.txt. Tested this with bzr bd and it now installs to /usr/lib/python3/dist-packages

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-06:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~brendan-donegan/messaging-app/python3_autopilot updated on 2014-07-08

113. By Brendan Donegan on 2014-07-08: Merged from trunk

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2014-07-08:

Caught this up with trunk.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-08:

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 changes on this 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

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:

Brendan Donegan

Sam Short

Ubuntu Phablet Team

1	=== modified file 'debian/control'
2	--- debian/control 2014-07-02 18:16:09 +0000
3	+++ debian/control 2014-07-08 13:31:01 +0000
4	@@ -7,7 +7,7 @@
5	dh-translations,
6	python-flake8,
7	pkg-config,
8	- python,
9	+ python3,
10	qt5-default,
11	qtbase5-dev (>= 5.0),
12	qtdeclarative5-dev (>= 5.0),
13	@@ -40,7 +40,7 @@
14	libqt5test5,
15	libqt5widgets5,
16	messaging-app (>= ${binary:Version}),
17	- python-autopilot,
18	+ python3-autopilot,
19	ubuntu-ui-toolkit-autopilot,
20	ofono-phonesim-autostart,
21	Description: autopilot tests for messaging-app
22
23	=== modified file 'tests/CMakeLists.txt'
24	--- tests/CMakeLists.txt 2013-11-21 13:26:32 +0000
25	+++ tests/CMakeLists.txt 2014-07-08 13:31:01 +0000
26	@@ -1,6 +1,6 @@
27	set(AUTOPILOT_DIR autopilot/messaging_app)
28
29	-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
30	+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
31	OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
32
33	install(DIRECTORY ${AUTOPILOT_DIR}
34
35	=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
36	--- tests/autopilot/messaging_app/tests/test_messaging.py 2014-06-25 07:21:10 +0000
37	+++ tests/autopilot/messaging_app/tests/test_messaging.py 2014-07-08 13:31:01 +0000
38	@@ -29,12 +29,12 @@
39	class BaseMessagingTestCase(MessagingAppTestCase):
40
41	def setUp(self):
42	-
43	# determine whether we are running with phonesim
44	try:
45	out = subprocess.check_output(
46	['/usr/share/ofono/scripts/list-modems'],
47	- stderr=subprocess.PIPE
48	+ stderr=subprocess.PIPE,
49	+ universal_newlines=True
50	)
51	have_phonesim = out.startswith('[ /phonesim ]')
52	except subprocess.CalledProcessError: