Ubuntu Music App

Merge lp:~vthompson/music-app/remix-fix-1387618 into lp:music-app/remix

  1. remix-fix-1387618
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 726
Merged at revision: 723
Proposed branch: lp:~vthompson/music-app/remix-fix-1387618
Merge into: lp:music-app/remix
Diff against target: 63 lines (+6/-2)
5 files modified
MusicAlbums.qml (+1/-0)
MusicStart.qml (+1/-0)
common/AlbumsPage.qml (+1/-0)
common/SongsPage.qml (+1/-0)
tests/autopilot/music_app/tests/test_music.py (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-fix-1387618
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+240198@code.launchpad.net

Commit message

* Don't show all artists with same album

Description of the change

* Don't show all artists with same album

This doesn't fix the related bug (https://bugs.launchpad.net/bugs/1377510) which deals with "various artists" type of albums. That needs a bit more testing/investigation. This does, however, make the behavior the Albums tab and the SongsPage consistent.

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:723
http://91.189.93.70:8080/job/music-app-remix-ci/218/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1396
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1396/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/218

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

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

FAILED: Continuous integration, rev:724
http://91.189.93.70:8080/job/music-app-remix-ci/219/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1397
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/219

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

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

FAILED: Continuous integration, rev:725
http://91.189.93.70:8080/job/music-app-remix-ci/220/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1398
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/220

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

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

LGTM :)

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-remix-autolanding/85/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1399
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1399/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-autolanding/85

review: Needs Fixing (continuous-integration)
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-remix-autolanding/86/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1400
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1400/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-autolanding/86

review: Needs Fixing (continuous-integration)
lp:~vthompson/music-app/remix-fix-1387618 updated
726. By Victor Thompson

Correct the AP test

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

PASSED: Continuous integration, rev:726
http://91.189.93.70:8080/job/music-app-remix-ci/221/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1407
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/221

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicAlbums.qml'
2--- MusicAlbums.qml 2014-10-26 16:18:12 +0000
3+++ MusicAlbums.qml 2014-10-31 14:10:42 +0000
4@@ -52,6 +52,7 @@
5 var songsPage = comp.createObject(mainPageStack,
6 {
7 "album": model.title,
8+ "artist": model.artist,
9 "covers": [{art: model.art}],
10 "isAlbum": true,
11 "genre": undefined,
12
13=== modified file 'MusicStart.qml'
14--- MusicStart.qml 2014-10-29 00:49:40 +0000
15+++ MusicStart.qml 2014-10-31 14:10:42 +0000
16@@ -87,6 +87,7 @@
17 var songsPage = comp.createObject(mainPageStack,
18 {
19 "album": model.type !== "playlist" ? model.data : undefined,
20+ "artist": model.type !== "playlist" ? secondaryText : undefined,
21 "covers": coverSources,
22 "isAlbum": (model.type === "album"),
23 "genre": undefined,
24
25=== modified file 'common/AlbumsPage.qml'
26--- common/AlbumsPage.qml 2014-10-26 16:18:12 +0000
27+++ common/AlbumsPage.qml 2014-10-31 14:10:42 +0000
28@@ -140,6 +140,7 @@
29 var songsPage = comp.createObject(mainPageStack,
30 {
31 "album": model.title,
32+ "artist": model.artist,
33 "covers": [{art: model.art}],
34 "isAlbum": true,
35 "genre": undefined,
36
37=== modified file 'common/SongsPage.qml'
38--- common/SongsPage.qml 2014-10-29 02:53:57 +0000
39+++ common/SongsPage.qml 2014-10-31 14:10:42 +0000
40@@ -43,6 +43,7 @@
41
42 property var page
43 property alias album: songsModel.album
44+ property alias artist: songsModel.artist
45 property alias genre: songsModel.genre
46
47 property bool playlistChanged: false
48
49=== modified file 'tests/autopilot/music_app/tests/test_music.py'
50--- tests/autopilot/music_app/tests/test_music.py 2014-10-24 19:36:52 +0000
51+++ tests/autopilot/music_app/tests/test_music.py 2014-10-31 14:10:42 +0000
52@@ -518,9 +518,9 @@
53 # get now playing again as it has moved
54 now_playing_page = self.app.get_now_playing_page()
55
56- # verify track queue has added all songs to initial value
57+ # verify track queue has added the song to the initial value
58 self.assertThat(self.app.get_queue_count(),
59- Equals(initial_tracks_count + 2))
60+ Equals(initial_tracks_count + 1))
61
62 # Assert that the song added to the list is playing
63 self.assertThat(self.player.currentIndex,

Subscribers

People subscribed via source and target branches