Merge lp:~xnox/music-app/better-tune into lp:music-app/trusty

[Dimitri John Ledkov]

* Replace screeching, choppy digitalised song with a neutral guitar tune.
* Do not hardcode the name of test song/artist, instead use testclass properties.

* Replace screeching, choppy digitalised song with a neutral guitar tune.
* Do not hardcode the name of test song/artist, instead use testclass properties.

[Dimitri John Ledkov (xnox)]

The original test song is not easy-listening enough, especially when one is re-running music-app test-suite over and over and over again.

[Victor Thompson (vthompson)]

I doubt this will work as you will need to modify the canned mediascanner library that the tests use.

review: Disapprove

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

FAILED: Continuous integration, rev:370
http://91.189.93.70:8080/job/music-app-ci/633/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1635
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/633
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/635
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/354

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

review: Needs Fixing (continuous-integration)

[Dimitri John Ledkov (xnox)]

On 7 March 2014 21:23, Victor Thompson <email address hidden> wrote:
> Review: Disapprove
>
> I doubt this will work as you will need to modify the canned mediascanner library that the tests use.

Yeah I did wonder about that, since the tests do work on touch.
Instructions must be included on how to generate that cache, ideally
via a script, as otherwise it's non-free blobs.

How do i rebuild the test mediascanner cache?

--
Regards,

Dimitri.

[Victor Thompson (vthompson)]

You could probably 1) remove your ~/.cache/mediascanner directory, 2) store the music files from tests/autopilot/music_app/content/ and ONLY those files in /home/autopilot-music-app/Music/ and rerun mediascanner with that directory as input. Feel free to inspect the non-free blobs to ensure the data locations are correct, etc.

You should note that this version of the mediascanner will not be used by the app for very much longer (hopefully under 1-2 months)--so your efforts might be for naught.

[Dimitri John Ledkov (xnox)]

On 7 March 2014 22:07, Victor Thompson <email address hidden> wrote:
> You could probably 1) remove your ~/.cache/mediascanner directory, 2) store the music files from tests/autopilot/music_app/content/ and ONLY those files in /home/autopilot-music-app/Music/ and rerun mediascanner with that directory as input. Feel free to inspect the non-free blobs to ensure the data locations are correct, etc.
>
> You should note that this version of the mediascanner will not be used by the app for very much longer (hopefully under 1-2 months)--so your efforts might be for naught.

Yeah, i've noticed that there are _two_ media scanners running with
different caches. I'll regenerate the caches.

--
Regards,

Dimitri.

[Victor Thompson (vthompson)]

Also, we intentionally used small files. The ogg you are including is over 3MB, whereas the previous one was 500K.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Can we just re-encode the new audio files at a lower bitrate and make them mono to make them smaller?

[Victor Thompson (vthompson)]

We could do something like that. I think we've decided that mostly the size doesn't matter *so* much, however. I think the more important thing is to try to build up a realistic structure of a few Artists and Albums comprising of multiple genres of music. The song Dimitri's proposing here will be included when we move the test suite over to mediascanner2.0's db.

I'm going to change this to Needs Fixing, since we decided size doesn't matter as much. But trying to fit another test track into the old mediascanner library might not be worth anyone's time.

review: Needs Fixing

[David Planella (dpm)]

I'll mark this one as Work In Progress, since it's effectively blocked until we land mediascanner2.0 support

=== modified file 'tests/autopilot/music_app/content/1.ogg'
 Binary files tests/autopilot/music_app/content/1.ogg	2013-09-27 15:14:10 +0000 and tests/autopilot/music_app/content/1.ogg	2014-03-07 21:20:35 +0000 differ
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-03-07 16:40:31 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-03-07 21:20:35 +0000
@@ -29,6 +29,8 @@
         #wait for activity indicator to stop spinning
         spinner = lambda: self.main_view.get_spinner().running
         self.assertThat(spinner, Eventually(Equals(False)))
+        self.trackTitle = u"Gran Vals"
+        self.artistName = u"Francisco Tárrega"
 
     def test_reads_music_library(self):
         """ tests if the music library is populated from our
@@ -37,15 +39,14 @@
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         title = lambda: self.player.currentMetaTitle
         artist = lambda: self.player.currentMetaArtist
-        self.assertThat(title,
-                        Eventually(Equals("Foss Yeaaaah! (Radio Edit)")))
-        self.assertThat(artist, Eventually(Equals("Benjamin Kerensa")))
+        self.assertThat(title, Eventually(Equals(self.trackTitle)))
+        self.assertThat(artist, Eventually(Equals(self.artistName)))
 
     def test_play_pause_library(self):
         """ Test playing and pausing a track (Music Library must exist) """
@@ -53,8 +54,8 @@
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         # click back button
@@ -85,8 +86,8 @@
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         playbutton = self.main_view.get_now_playing_play_button()
@@ -108,8 +109,8 @@
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         playbutton = self.main_view.get_now_playing_play_button()
@@ -169,8 +170,8 @@
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         playbutton = self.main_view.get_now_playing_play_button()
@@ -226,8 +227,8 @@
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         """ Track is playing, shuffle is turned on"""
@@ -310,18 +311,16 @@
     def test_show_albums_sheet(self):
         """tests navigating to the Albums tab and displaying the album sheet"""
 
-        artistName = "Benjamin Kerensa"
-
         # switch to albums tab
         self.main_view.switch_to_tab("albumstab")
 
         #select album
-        albumartist = self.main_view.get_albums_albumartist(artistName)
+        albumartist = self.main_view.get_albums_albumartist(self.artistName)
         self.pointing_device.click_object(albumartist)
 
         #get album sheet album artist
         sheet_albumartist = self.main_view.get_album_sheet_artist()
-        self.assertThat(sheet_albumartist.text, Equals(artistName))
+        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
 
         # click on close button to close album sheet
         closebutton = self.main_view.get_album_sheet_close_button()
@@ -331,9 +330,6 @@
     def test_add_song_to_queue_from_albums_sheet(self):
         """tests navigating to the Albums tab and adding a song to queue"""
 
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        artistName = "Benjamin Kerensa"
-
         # get number of tracks in queue before queuing a track
         initialtracksCount = self.main_view.get_queue_track_count()
 
@@ -341,16 +337,16 @@
         self.main_view.switch_to_tab("albumstab")
 
         #select album
-        albumartist = self.main_view.get_albums_albumartist(artistName)
+        albumartist = self.main_view.get_albums_albumartist(self.artistName)
         self.pointing_device.click_object(albumartist)
 
         #get album sheet album artist
         sheet_albumartist = self.main_view.get_album_sheet_artist()
-        self.assertThat(sheet_albumartist.text, Equals(artistName))
+        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
 
         #get track item to add to queue
         trackicon = self.main_view.get_album_sheet_listview_trackicon(
-            trackTitle)
+            self.trackTitle)
         self.pointing_device.click_object(trackicon)
 
         #click on Add to queue
@@ -368,11 +364,11 @@
 
         #verify song's metadata matches the item added to the Now Playing view
         queueArtistName = self.main_view.get_queue_now_playing_artist(
-            artistName)
-        self.assertThat(str(queueArtistName.text), Equals(artistName))
+            self.artistName)
+        self.assertThat(str(queueArtistName.text), Equals(self.artistName))
         queueTrackTitle = self.main_view.get_queue_now_playing_title(
-            trackTitle)
-        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
+            self.trackTitle)
+        self.assertThat(str(queueTrackTitle.text), Equals(self.trackTitle))
 
         # click on close button to close album sheet
         closebutton = self.main_view.get_album_sheet_close_button()
@@ -383,9 +379,6 @@
         """tests navigating to the Songs tab and adding the library to the
            queue with the selected item being played. """
 
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        artistName = "Benjamin Kerensa"
-
         # get number of tracks in queue before queuing a track
         initialtracksCount = self.main_view.get_queue_track_count()
 
@@ -393,7 +386,7 @@
         self.main_view.switch_to_tab("trackstab")
 
         # get track item to add to queue
-        trackitem = self.main_view.get_songs_tab_tracktitle(trackTitle)
+        trackitem = self.main_view.get_songs_tab_tracktitle(self.trackTitle)
         self.pointing_device.click_object(trackitem)
 
         # verify track queue has added all songs to initial value
@@ -407,19 +400,16 @@
 
         # verify song's metadata matches the item added to the Now Playing view
         queueArtistName = self.main_view.get_queue_now_playing_artist(
-            artistName)
-        self.assertThat(str(queueArtistName.text), Equals(artistName))
+            self.artistName)
+        self.assertThat(str(queueArtistName.text), Equals(self.artistName))
         queueTrackTitle = self.main_view.get_queue_now_playing_title(
-            trackTitle)
-        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
+            self.trackTitle)
+        self.assertThat(str(queueTrackTitle.text), Equals(self.trackTitle))
 
     def test_add_song_to_queue_from_songs_tab(self):
         """tests navigating to the Songs tab and adding a song from the library
            to the queue via the expandable list view item. """
 
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        artistName = "Benjamin Kerensa"
-
         # get number of tracks in queue before queuing a track
         initialtracksCount = self.main_view.get_queue_track_count()
 
@@ -427,7 +417,7 @@
         self.main_view.switch_to_tab("trackstab")
 
         # get track item to add to queue
-        trackitem = self.main_view.get_songs_tab_trackimage(trackTitle)
+        trackitem = self.main_view.get_songs_tab_trackimage(self.trackTitle)
         self.pointing_device.click_object(trackitem)
         addtoqueueLabel = self.main_view.get_songs_tab_add_to_queue_label()
         self.pointing_device.click_object(addtoqueueLabel)
@@ -443,23 +433,21 @@
 
         # verify song's metadata matches the item added to the Now Playing view
         queueArtistName = self.main_view.get_queue_now_playing_artist(
-            artistName)
-        self.assertThat(str(queueArtistName.text), Equals(artistName))
+            self.artistName)
+        self.assertThat(str(queueArtistName.text), Equals(self.artistName))
         queueTrackTitle = self.main_view.get_queue_now_playing_title(
-            trackTitle)
-        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
+            self.trackTitle)
+        self.assertThat(str(queueTrackTitle.text), Equals(self.trackTitle))
 
     def test_create_playlist_from_songs_tab(self):
         """tests navigating to the Songs tab and creating a playlist by
            selecting a song to add it to a new playlist. """
 
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-
         # switch to songs tab
         self.main_view.switch_to_tab("trackstab")
 
         # get track item to add to queue
-        trackitem = self.main_view.get_songs_tab_trackimage(trackTitle)
+        trackitem = self.main_view.get_songs_tab_trackimage(self.trackTitle)
         self.pointing_device.click_object(trackitem)
         addtoplaylistLbl = self.main_view.get_songs_tab_add_to_playlist_label()
         self.pointing_device.click_object(addtoplaylistLbl)
@@ -497,9 +485,6 @@
     def test_artists_tab_album(self):
         """tests navigating to the Artists tab and playing an album"""
 
-        artistName = "Benjamin Kerensa"
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-
         # get number of tracks in queue before queuing a track
         initialtracksCount = self.main_view.get_queue_track_count()
 
@@ -507,26 +492,27 @@
         self.main_view.switch_to_tab("artiststab")
 
         #select artist
-        artist = self.main_view.get_artists_artist(artistName)
+        artist = self.main_view.get_artists_artist(self.artistName)
         self.pointing_device.click_object(artist)
 
         #get album sheet album artist
         sheet_albumartist = self.main_view.get_artist_sheet_artist()
-        self.assertThat(sheet_albumartist.text, Equals(artistName))
+        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
 
         #select artist
-        artist = self.main_view.get_artists_artist(artistName)
+        artist = self.main_view.get_artists_artist(self.artistName)
         self.pointing_device.click_object(artist)
 
         #get song sheet album artist
         sheet_albumartist = self.main_view.get_album_sheet_artist()
-        self.assertThat(sheet_albumartist.text, Equals(artistName))
+        self.assertThat(sheet_albumartist.text, Equals(self.artistName))
 
         # click on song to populate queue and start playing
         self.pointing_device.click_object(sheet_albumartist)
 
         #select artist
-        track = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        track = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(track)
 
         # verify track queue has added all songs to initial value
@@ -540,23 +526,21 @@
 
         # verify song's metadata matches the item added to the Now Playing view
         queueArtistName = self.main_view.get_queue_now_playing_artist(
-            artistName)
-        self.assertThat(str(queueArtistName.text), Equals(artistName))
+            self.artistName)
+        self.assertThat(str(queueArtistName.text), Equals(self.artistName))
         queueTrackTitle = self.main_view.get_queue_now_playing_title(
-            trackTitle)
-        self.assertThat(str(queueTrackTitle.text), Equals(trackTitle))
+            self.trackTitle)
+        self.assertThat(str(queueTrackTitle.text), Equals(self.trackTitle))
 
     def test_swipe_to_delete_song(self):
         """tests navigating to the Now Playing queue, swiping to delete a
         track, and confirming the delete action. """
 
-        artistName = "Benjamin Kerensa"
-
         # populate queue
         first_genre_item = self.main_view.get_first_genre_item()
         self.pointing_device.click_object(first_genre_item)
-        trackTitle = "Foss Yeaaaah! (Radio Edit)"
-        song = self.main_view.get_album_sheet_listview_tracktitle(trackTitle)
+        song = self.main_view.get_album_sheet_listview_tracktitle(
+            self.trackTitle)
         self.pointing_device.click_object(song)
 
         # get initial queue count
@@ -564,7 +548,7 @@
 
         # get song to delete
         artistToDelete = self.main_view.get_queue_now_playing_artist(
-            artistName)
+            self.artistName)
         musicnowplayingpage = self.main_view.get_MusicNowPlaying_page()
 
         # get coordinates to delete song