Merge lp:~nskaggs/reminders-app/py3-jenkins into lp:reminders-app

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 120
Merged at revision: 119
Proposed branch: lp:~nskaggs/reminders-app/py3-jenkins
Merge into: lp:reminders-app
Diff against target: 36 lines (+5/-5)
2 files modified
debian/control (+4/-4)
tests/autopilot/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~nskaggs/reminders-app/py3-jenkins
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Notes app developers Pending
Review via email: mp+218490@code.launchpad.net

Commit message

Enable jenkins to run python3 tests

Description of the change

Enable jenkins to run python3 tests

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
120. By Nicholas Skaggs

print is a function :-)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

of course, thanks for finding and fixing it.

review: Approve

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-05-06 17:03:52 +0000
3+++ debian/control 2014-05-06 20:33:07 +0000
4@@ -6,7 +6,7 @@
5 gettext,
6 libboost-dev,
7 libssl-dev,
8- python,
9+ python3-all,
10 qt5-default,
11 qtdeclarative5-dev,
12 Standards-Version: 3.9.4
13@@ -51,9 +51,9 @@
14 reminders-app (= ${source:Version}),
15 libautopilot-qt,
16 libqt5test5,
17- python-dbus,
18- python-dbusmock,
19- python-fixtures,
20+ python3-dbus,
21+ python3-dbusmock,
22+ python3-fixtures,
23 ubuntu-ui-toolkit-autopilot,
24 Description: Test package for the Reminders app
25 Autopilot tests for the Reminders app package
26
27=== modified file 'tests/autopilot/CMakeLists.txt'
28--- tests/autopilot/CMakeLists.txt 2014-01-19 13:59:12 +0000
29+++ tests/autopilot/CMakeLists.txt 2014-05-06 20:33:07 +0000
30@@ -1,5 +1,5 @@
31 if(INSTALL_TESTS)
32-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
33+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
34 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
35
36 install(DIRECTORY ${AUTOPILOT_DIR}

Subscribers

People subscribed via source and target branches