Merge lp:~ahayzen/music-app/autopilot-move-py3 into lp:music-app/trusty

[Andrew Hayzen]

* Use python3 for autopilot in all cases

* Use python3 for autopilot in all cases

This allows jenkins to use python 3 as well as devices.

[Andrew Hayzen (ahayzen)]

#blocked bug 1365247 (mediascanner2 db schema change)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:614
http://91.189.93.70:8080/job/music-app-ci/1098/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1900
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1900/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/322

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1098/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

#unblocked

[Victor Thompson (vthompson)]

See inline comment/question: Do we still directly depend on python-mock?

review: Needs Information

[lp:~ahayzen/music-app/autopilot-move-py3]

615. By Andrew Hayzen on 2014-09-08

* Remove python-mock depends

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:615
http://91.189.93.70:8080/job/music-app-ci/1108/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1940/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/332

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1108/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Kicked off a trial run of this under python3 here:

http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/250/

[Nicholas Skaggs (nskaggs)]

LGTM, passes py3 jenkins.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-07-01 23:13:50 +0000
+++ debian/control	2014-09-08 13:27:30 +0000
@@ -5,7 +5,7 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                intltool,
-               python,
+               python3,
                qt5-default,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/music-app
@@ -39,7 +39,6 @@
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
          music-app (= ${source:Version}),
-         python-mock,
          ubuntu-ui-toolkit-autopilot,
          ${misc:Depends},
 Description: Autopilot tests for Music App

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-05-26 16:50:13 +0000
+++ tests/autopilot/CMakeLists.txt	2014-09-08 13:27:30 +0000
@@ -1,5 +1,5 @@
 if(INSTALL_TESTS)
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(DIRECTORY ${AUTOPILOT_DIR}