Merge lp:~nskaggs/music-app/fix-1379488 into lp:music-app/trusty

[Nicholas Skaggs]

add precompile qml apparmor dirs

add precompile qml apparmor dirs. Depends on https://code.launchpad.net/~nskaggs/autopilot/add-click-rule/+merge/237836

[lp:~nskaggs/music-app/fix-1379488]

647. By Nicholas Skaggs on 2014-10-09

fix typo

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

PASSED: Continuous integration, rev:647
http://91.189.93.70:8080/job/music-app-ci/1146/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/818
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/818/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/370

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Music seems fine without this; and the autopilot fix isn't be pursued atm. Setting to WIP for now.

Unmerged revisions

647. By Nicholas Skaggs on 2014-10-09

fix typo

646. By Nicholas Skaggs on 2014-10-09

add precompile qml apparmor dirs

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2014-09-25 00:39:47 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2014-10-09 21:31:40 +0000
@@ -135,6 +135,8 @@
             temp_dir_cache_media = os.path.join(temp_dir_cache, 'media-art')
             temp_dir_cache_write = os.path.join(temp_dir_cache,
                                                 'tncache-write-text.null')
+            temp_dir_qml = os.path.join(temp_dir_cache, 'QML', 'Apps')
+
             temp_dir_config = os.path.join(temp_dir, '.config')
             temp_dir_toolkit = os.path.join(temp_dir_config,
                                             'ubuntu-ui-toolkit')
@@ -150,6 +152,8 @@
                 os.makedirs(temp_dir_cache_media)
             if not os.path.exists(temp_dir_cache_write):
                 os.makedirs(temp_dir_cache_write)
+            if not os.path.exists(temp_dir_qml):
+                os.makedirs(temp_dir_qml)
             if not os.path.exists(temp_dir_config):
                 os.makedirs(temp_dir_config)
             if not os.path.exists(temp_dir_toolkit):