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

[Nicholas Skaggs]

Enable test for shuffle mode

Trying to land shuffle test; https://code.launchpad.net/~vthompson/music-app/fix-shuffle-test/+merge/193722

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

PASSED: Continuous integration, rev:239
http://91.189.93.70:8080/job/music-app-ci/306/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/130
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/306
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/308
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/27

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This branch works as-is on my nexus4 and passes here, so :-)

[Nicholas Skaggs (nskaggs)]

Victor, let's push this in and remove your mp, https://code.launchpad.net/~vthompson/music-app/fix-shuffle-test/+merge/193722, or you can make the change there.. Whatever works.

[Victor Thompson (vthompson)]

Sounds good

[Victor Thompson (vthompson)]

review: Approve

[lp:~nskaggs/music-app/fix-shuffle-test]

239. By Nicholas Skaggs on 2013-11-13

Enable test for shuffle mode.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2013-10-15 19:50:20 +0000
+++ MusicToolbar.qml	2013-11-13 20:30:32 +0000
@@ -787,11 +787,11 @@
 
                     onClicked: {
                         // Invert shuffle settings
-                        Settings.setSetting("shuffle", !(Settings.getSetting("shuffle") === "1"))
+                        mainView.random = !mainView.random
+                        shuffleIcon.opacity = mainView.random ? 1 : .4
+                        Settings.setSetting("shuffle", mainView.random)
                         console.debug("Shuffle:", Settings.getSetting("shuffle") === "1")
 
-                        mainView.random = Settings.getSetting("shuffle") === "1"
-                        shuffleIcon.opacity = Settings.getSetting("shuffle") === "1" ? 1 : .4
                     }
                 }
             }

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2013-11-01 19:52:31 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2013-11-13 20:30:32 +0000
@@ -10,7 +10,6 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from unittest import skip
 from testtools.matchers import Equals, LessThan
 
 from music_app.tests import MusicTestCase
@@ -137,7 +136,6 @@
         self.assertThat(title, Eventually(Equals("TestMP3Title")))
         self.assertThat(artist, Eventually(Equals("TestMP3Artist")))
 
-    @skip('Test needs work')
     def test_shuffle(self):
         """ Test shuffle (Music Library must exist) """
 
@@ -165,7 +163,7 @@
         forward = True
         count = 0
         while True:
-            self.assertThat(count, LessThan(10))
+            self.assertThat(count, LessThan(100))
             if forward:
                 self.pointing_device.click_object(forwardbutton)
             else: