Merge lp:~vthompson/music-app/fix-1293488 into lp:music-app/trusty

[Victor Thompson]

Fix some timing issues in 4 failing tests.

Fix some timing issues in 4 failing tests. Some of the tests that get attributes from the Player component seem to take a long time to select. Reorganized some of the logic to making timing issues work.

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

PASSED: Continuous integration, rev:385
http://91.189.93.70:8080/job/music-app-ci/648/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1778
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/648
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/650
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/369

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Giving this a runthrough on mako and flo.

[Nicholas Skaggs (nskaggs)]

Running on #243, doesn't seem to work:

Traceback (most recent call last):
File "/home/phablet/autopilot/music_app/tests/test_music.py", line 54, in test_play_pause_library
first_genre_item = self.main_view.get_first_genre_item()
File "/home/phablet/autopilot/music_app/emulators.py", line 83, in get_first_genre_item
return self.wait_select_single("*", objectName="genreItemObject")
File "/usr/lib/python2.7/dist-packages/autopilot/introspection/dbus.py", line 374, in wait_select_single
return self.select_single(type_name, **kwargs)
File "/usr/lib/python2.7/dist-packages/autopilot/introspection/dbus.py", line 321, in select_single
raise ValueError("More than one item was returned for query")
ValueError: More than one item was returned for query
}}}

[Victor Thompson (vthompson)]

What might actually be the problem is that you still have your media in the mediascanner database. You could move the ~/.cache/mediascanner directory for safe keeping and reboot the phone. If so, this is related to lp:1292044

[Nicholas Skaggs (nskaggs)]

Victor, of course. Argh, why did someone disable the home patching on click . . .

[Victor Thompson (vthompson)]

Over the weekend I tried to do so. It seems like mocking of the home directory isn't "preserved" when the click package is ran. There might be other tricks that we'll need to do.

[Nicholas Skaggs (nskaggs)]

Yes, just undoing things and using the same mock setup doesn't do it. Regardless, this gets my greenlight, with the note I wasn't able to test properly because of the bug mentioned above.

review: Approve

[Sergio Schvezov (sergiusens)]

You can't mock the env with click as it's launched with upstart; in any case you could inject stuff in upstart with initctl set-env

[Leo Arias (elopio)]

We have a fixture in the oven to help tests setting temporary values on the env:
https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/initctl_env_var/+merge/208612

=== 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-18 01:09:01 +0000
@@ -61,13 +61,13 @@
         back_button = self.main_view.get_back_button()
         self.pointing_device.click_object(back_button)
 
-        self.main_view.show_toolbar()
-
         if self.main_view.wideAspect:
             playbutton = self.main_view.get_now_playing_play_button()
         else:
             playbutton = self.main_view.get_play_button()
 
+        self.main_view.show_toolbar()
+
         """ Track is playing"""
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
         self.pointing_device.click_object(playbutton)
@@ -113,7 +113,6 @@
         self.pointing_device.click_object(song)
 
         playbutton = self.main_view.get_now_playing_play_button()
-        shufflebutton = self.main_view.get_shuffle_button()
 
         title = lambda: self.player.currentMetaTitle
         artist = lambda: self.player.currentMetaArtist
@@ -131,6 +130,7 @@
 
         #ensure shuffle is off
         if self.player.shuffle:
+            shufflebutton = self.main_view.get_shuffle_button()
             logger.debug("Turning off shuffle")
             self.pointing_device.click_object(shufflebutton)
         else:
@@ -143,6 +143,10 @@
         self.pointing_device.click_object(forwardbutton)
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
 
+        """ Pause track """
+        self.pointing_device.click_object(playbutton)
+        self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
+
         #ensure different song
         self.assertThat(title, Eventually(NotEquals(orgTitle)))
         self.assertThat(artist, Eventually(NotEquals(orgArtist)))
@@ -150,15 +154,15 @@
         nextArtist = self.player.currentMetaArtist
         logger.debug("Next Song %s, %s" % (nextTitle, nextArtist))
 
-        """ Pause track """
-        self.pointing_device.click_object(playbutton)
-        self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
-
         """ Select previous """
         previousbutton = self.main_view.get_previous_button()
         self.pointing_device.click_object(previousbutton)
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
 
+        """ Pause track """
+        self.pointing_device.click_object(playbutton)
+        self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
+
         #ensure we're back to original song
         self.assertThat(title, Eventually(Equals(orgTitle)))
         self.assertThat(artist, Eventually(Equals(orgArtist)))
@@ -179,16 +183,13 @@
         title = self.player.currentMetaTitle
         artist = self.player.currentMetaArtist
 
-        #ensure track is playing
-        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
-
         #ensure shuffle is off
         if self.player.shuffle:
             logger.debug("Turning off shuffle")
             self.pointing_device.click_object(shufflebutton)
+            self.assertThat(self.player.shuffle, Eventually(Equals(False)))
         else:
             logger.debug("Shuffle already off")
-        self.assertThat(self.player.shuffle, Eventually(Equals(False)))
 
         """ Track is playing """
         count = 1
@@ -198,15 +199,14 @@
         while title != "TestMP3Title" and artist != "TestMP3Artist":
             self.assertThat(count, LessThan(queue))
 
-            """ Pause track """
-            self.pointing_device.click_object(playbutton)
-            self.assertThat(self.player.isPlaying,
-                            Eventually(Equals(False)))
-
             """ Select next """
             forwardbutton = self.main_view.get_forward_button()
             self.pointing_device.click_object(forwardbutton)
-            self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
+
+            """ Pause track """
+            self.pointing_device.click_object(playbutton)
+            self.assertThat(self.player.isPlaying,
+                            Eventually(Equals(False)))
 
             title = self.player.currentMetaTitle
             artist = self.player.currentMetaArtist
@@ -218,6 +218,7 @@
         #make sure mp3 plays
         self.assertThat(self.player.source.endswith("mp3"),
                         Equals(True))
+        self.pointing_device.click_object(playbutton)
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
 
     def test_shuffle(self):
@@ -475,7 +476,7 @@
         playlistNameFld = self.main_view.get_newPlaylistDialog_name_textfield()
         self.pointing_device.click_object(playlistNameFld)
         playlistNameFld.focus.wait_for(True)
-        self.keyboard.type("MyPlaylist")
+        self.keyboard.type("myPlaylist")
 
         # click on get_newPlaylistDialog create Button
         createButton = self.main_view.get_newPlaylistDialog_createButton()
@@ -484,7 +485,7 @@
         # verify playlist has been sucessfully created
         palylist_final_count = self.main_view.get_addtoplaylistview()[0].count
         self.assertThat(palylist_final_count, Equals(playlist_count + 1))
-        playlist = self.main_view.get_playlistname("MyPlaylist")
+        playlist = self.main_view.get_playlistname("myPlaylist")
         self.assertThat(playlist, Not(Is(None)))
 
         # select playlist to add song to