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

Proposed by Nicholas Skaggs on 2014-10-09
Status: Work in progress
Proposed branch: lp:~nskaggs/music-app/fix-1379488
Merge into: lp:music-app/trusty
Diff against target: 21 lines (+4/-0)
1 file modified
tests/autopilot/music_app/tests/__init__.py (+4/-0)
To merge this branch: bzr merge lp:~nskaggs/music-app/fix-1379488
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-10-09
Music App Developers 2014-10-09 Pending
Review via email: mp+237866@code.launchpad.net

Commit message

add precompile qml apparmor dirs

Description of the change

To post a comment you must log in.
lp:~nskaggs/music-app/fix-1379488 updated on 2014-10-09
647. By Nicholas Skaggs on 2014-10-09

fix typo

Nicholas Skaggs (nskaggs) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/music_app/tests/__init__.py'
2--- tests/autopilot/music_app/tests/__init__.py 2014-09-25 00:39:47 +0000
3+++ tests/autopilot/music_app/tests/__init__.py 2014-10-09 21:31:40 +0000
4@@ -135,6 +135,8 @@
5 temp_dir_cache_media = os.path.join(temp_dir_cache, 'media-art')
6 temp_dir_cache_write = os.path.join(temp_dir_cache,
7 'tncache-write-text.null')
8+ temp_dir_qml = os.path.join(temp_dir_cache, 'QML', 'Apps')
9+
10 temp_dir_config = os.path.join(temp_dir, '.config')
11 temp_dir_toolkit = os.path.join(temp_dir_config,
12 'ubuntu-ui-toolkit')
13@@ -150,6 +152,8 @@
14 os.makedirs(temp_dir_cache_media)
15 if not os.path.exists(temp_dir_cache_write):
16 os.makedirs(temp_dir_cache_write)
17+ if not os.path.exists(temp_dir_qml):
18+ os.makedirs(temp_dir_qml)
19 if not os.path.exists(temp_dir_config):
20 os.makedirs(temp_dir_config)
21 if not os.path.exists(temp_dir_toolkit):

Subscribers

People subscribed via source and target branches

to status/vote changes: