Merge lp:~ahayzen/music-app/python3-depends into lp:music-app/trusty

[Andrew Hayzen]

* Change to python3 depends

* Change to python3 depends

Test MP to see if python3 depends resolve jenkins issues.

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

FAILED: Continuous integration, rev:517
http://91.189.93.70:8080/job/music-app-ci/918/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/937/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/142/console

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/python3-depends]

518. By Andrew Hayzen on 2014-07-09

* Change cmake autopilot to python3

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

FAILED: Continuous integration, rev:518
http://91.189.93.70:8080/job/music-app-ci/919/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/938/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/143/console

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/python3-depends]

519. By Andrew Hayzen on 2014-07-09

* Fix for py3 syntax error for cmake file

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

FAILED: Continuous integration, rev:519
http://91.189.93.70:8080/job/music-app-ci/920/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/939
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/939/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/144

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/music-app/python3-depends]

520. By Andrew Hayzen on 2014-07-10

* Further tweaks

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

FAILED: Continuous integration, rev:520
http://91.189.93.70:8080/job/music-app-ci/921/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/940
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/145

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

After running "phablet-click-test-setup" the tests pass on the device. I think the SDK or pieces of the platform are stale in Jenkins and in the device until updated. I do not know how to get Jenkins updated.

review: Disapprove

Unmerged revisions

520. By Andrew Hayzen on 2014-07-10

* Further tweaks

519. By Andrew Hayzen on 2014-07-09

* Fix for py3 syntax error for cmake file

518. By Andrew Hayzen on 2014-07-09

* Change cmake autopilot to python3

517. By Andrew Hayzen on 2014-07-09

* Change to python3 depends

=== modified file 'debian/control'
--- debian/control	2014-06-06 21:07:59 +0000
+++ debian/control	2014-07-10 00:02:33 +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
@@ -38,7 +38,7 @@
 Depends: libautopilot-qt (>= 1.4),
          libqt5test5,
          music-app (= ${source:Version}),
-         python-mock,
+         python3-autopilot,
          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-07-10 00:02:33 +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}
@@ -7,4 +7,16 @@
     )
 endif(INSTALL_TESTS)
 
+function(declare_autopilot_test ENVIROMENT TEST_NAME WORKING_DIR)
+    if(AUTOPILOT_BIN)
+        add_custom_command(TARGET autopilot
+            COMMAND ${ENVIROMENT} autopilot run ${TEST_NAME} ${AUTOPILOT_TESTS_ARGS}
+            WORKING_DIRECTORY ${WORKING_DIR})
+    endif()
+endfunction()
+
+declare_autopilot_test(AUTOPILOT_APP=${music_src_BINARY_DIR}/music-app
+    ${AUTOPILOT_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
 add_subdirectory(music_app)

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2014-06-27 01:23:04 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2014-07-10 00:02:33 +0000
@@ -224,7 +224,7 @@
                                 "/mediastore.sql", dblocation, relhome)
 
         con = sqlite3.connect(mediascannerpath + "/mediastore.db")
-        f = open(mediascannerpath + "/mediastore.sql", 'r')
+        f = open(mediascannerpath + "/mediastore.sql", 'rb')
         sql = f.read()
         cur = con.cursor()
         cur.executescript(sql)