Ubuntu Music App

Merge lp:~vthompson/music-app/remove-initial-dbus-limitations into lp:music-app/trusty

  1. remove-initial-dbus-limitations
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 504
Merged at revision: 505
Proposed branch: lp:~vthompson/music-app/remove-initial-dbus-limitations
Merge into: lp:music-app/trusty
Diff against target: 141 lines (+1/-45)
7 files modified
MusicArtists.qml (+0/-3)
MusicStart.qml (+0/-3)
MusicTracks.qml (+0/-3)
common/AlbumsSheet.qml (+0/-6)
common/SongsSheet.qml (+0/-3)
music-app.qml (+0/-6)
tests/autopilot/music_app/tests/__init__.py (+1/-21)
To merge this branch: bzr merge lp:~vthompson/music-app/remove-initial-dbus-limitations
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Andrew Hayzen Approve
Review via email: mp+224272@code.launchpad.net

Commit message

* Remove workarounds for Mediascanner 2.0 D-Bus issues

Description of the change

This branch removes workarounds that are currently in place due to D-Bus issues seen while using Mediascanner 2.0. There is a branch in the works[1] that makes the dbus implementation optional and selectable via an environment variable, with the default being "no dbus"/direct access.

[1] https://code.launchpad.net/~jamesh/mediascanner2/optional-dbus/+merge/224270

THIS CAN NOT BE MERGED UNTIL THE ABOVE BRANCH HAS BEEN DEPLOYED

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:503
http://91.189.93.70:8080/job/music-app-ci/888/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/617
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/112

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Works for me on utopic (mako) [~300 tracks] and trusty (desktop) [~2500 tracks].

Please test on further devices before top approving though (ideally where it was failing before)

review: Approve
Revision history for this message
Victor Thompson (vthompson) wrote :

Verified image #98 did not work with this branch and that image #100 works. Also ran tests and verified that there is no mediascanner-dbus-2.0 process running at any time.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/476/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/678/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/17/console

review: Needs Fixing (continuous-integration)
lp:~vthompson/music-app/remove-initial-dbus-limitations updated
504. By Victor Thompson

merge trunk, resolve conflicts

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicArtists.qml'
2--- MusicArtists.qml 2014-06-15 13:43:37 +0000
3+++ MusicArtists.qml 2014-06-27 00:08:07 +0000
4@@ -98,9 +98,6 @@
5 SongsModel {
6 id: songArtistModel
7 albumArtist: model.artist
8- // HACK: Temporarily setting limit to 500 to ensure model
9- // is populated. See lp:1326753
10- limit: 500
11 store: musicStore
12 }
13
14
15=== modified file 'MusicStart.qml'
16--- MusicStart.qml 2014-06-15 13:43:37 +0000
17+++ MusicStart.qml 2014-06-27 00:08:07 +0000
18@@ -280,9 +280,6 @@
19 SongsModel {
20 id: songGenreModel
21 genre: model.genre
22- // HACK: Temporarily setting limit to 500 to ensure model
23- // is populated. See lp:1326753
24- limit: 500
25 store: musicStore
26 }
27
28
29=== modified file 'MusicTracks.qml'
30--- MusicTracks.qml 2014-06-14 16:33:55 +0000
31+++ MusicTracks.qml 2014-06-27 00:08:07 +0000
32@@ -58,9 +58,6 @@
33 property alias rowCount: songsModel.rowCount
34 model: SongsModel {
35 id: songsModel
36- // HACK: Temporarily setting limit to 500 to ensure model
37- // is populated. See lp:1326753
38- limit: 500
39 store: musicStore
40 }
41 sort.property: "title"
42
43=== modified file 'common/AlbumsSheet.qml'
44--- common/AlbumsSheet.qml 2014-06-15 13:43:37 +0000
45+++ common/AlbumsSheet.qml 2014-06-27 00:08:07 +0000
46@@ -143,9 +143,6 @@
47 SongsModel {
48 id: songArtistModel
49 albumArtist: sheetItem.artist
50- // HACK: Temporarily setting limit to 500 to ensure model
51- // is populated. See lp:1326753
52- limit: 500
53 store: musicStore
54 }
55
56@@ -253,9 +250,6 @@
57 id: songAlbumArtistModel
58 albumArtist: model.artist
59 album: model.title
60- // HACK: Temporarily setting limit to 500 to ensure model
61- // is populated. See lp:1326753
62- limit: 500
63 store: musicStore
64 }
65 Repeater {
66
67=== modified file 'common/SongsSheet.qml'
68--- common/SongsSheet.qml 2014-06-15 13:43:37 +0000
69+++ common/SongsSheet.qml 2014-06-27 00:08:07 +0000
70@@ -46,9 +46,6 @@
71
72 SongsModel {
73 id: songsModel
74- // HACK: Temporarily setting limit to 500 to ensure model
75- // is populated. See lp:1326753
76- limit: 500
77 store: musicStore
78 }
79
80
81=== modified file 'music-app.qml'
82--- music-app.qml 2014-06-15 13:43:37 +0000
83+++ music-app.qml 2014-06-27 00:08:07 +0000
84@@ -508,17 +508,11 @@
85
86 SongsModel {
87 id: allSongsModel
88- // HACK: Temporarily setting limit to 500 to ensure model
89- // is populated. See lp:1326753
90- limit: 500
91 store: musicStore
92 }
93
94 SongsModel {
95 id: songsAlbumArtistModel
96- // HACK: Temporarily setting limit to 500 to ensure model
97- // is populated. See lp:1326753
98- limit: 500
99 store: musicStore
100 }
101
102
103=== modified file 'tests/autopilot/music_app/tests/__init__.py'
104--- tests/autopilot/music_app/tests/__init__.py 2014-06-24 21:20:16 +0000
105+++ tests/autopilot/music_app/tests/__init__.py 2014-06-27 00:08:07 +0000
106@@ -66,21 +66,7 @@
107 def setUp(self):
108 subprocess.call(["stop", "mediascanner-2.0"])
109
110- try:
111- pid = subprocess.check_output(["pidof", "mediascanner-dbus-2.0"])
112- except subprocess.CalledProcessError:
113- logger.debug("mediascanner-dbus-2.0 not running")
114- else:
115- pid = pid.decode("utf-8")
116- pid = pid.split(None, 1)[0]
117- subprocess.call(["kill", "-9", pid])
118-
119- # Stop any mediascanner-dbus and restart mediascanner on exit
120- self.addCleanup(subprocess.call,
121- 'kill -9 \
122- `pidof \
123- /usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0`',
124- shell=True)
125+ # Restart mediascanner on exit
126 self.addCleanup(subprocess.call, ["start", "mediascanner-2.0"])
127
128 launch, self.test_type = self.setup_environment()
129@@ -135,12 +121,6 @@
130 logger.debug("mediascanner launched %s" % retcode)
131 time.sleep(10)
132
133- logger.debug("Launching mediascanner-dbus")
134- retcode = subprocess.call(
135- "/usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0 &",
136- env=env, stderr=subprocess.STDOUT, shell=True)
137- logger.debug("mediascanner-dbus launched %s" % retcode)
138-
139 # we attempt to reset home for future upstart jobs
140 retcode = subprocess.check_output("initctl reset-env",
141 env=env, shell=True)

Subscribers

People subscribed via source and target branches

to status/vote changes: