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

[Victor Thompson]

* Update test_next_previous to seek to 0 before selecting previous

This appears to fail because the song isn't being paused quick enough after hitting the Next button. Thus, when Previous is being selected the time the track has been playing is over 5 seconds so the track starts over. This change causes the track to pause immediately (or close to immediately).

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

PASSED: Continuous integration, rev:499
http://91.189.93.70:8080/job/music-app-ci/884/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/592
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/592/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/108

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-1332570-test_next_previous]

500. By Victor Thompson on 2014-06-20

Seek to 0 prior to selecting previous

501. By Victor Thompson on 2014-06-20

Fix pep8

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

FAILED: Continuous integration, rev:500
http://91.189.93.70:8080/job/music-app-ci/885/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/593/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/109/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:501
http://91.189.93.70:8080/job/music-app-ci/886/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/594
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/594/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/110

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Hopefully should resolve the issue :)

And passes on mako locally for me:
00:17:28.789 INFO testresult:46 - OK: music_app.tests.test_music.TestMainWindow.test_next_previous(with touch)

Ran 1 test in 78.110s
OK

review: Approve

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-05-23 15:00:21 +0000
+++ MusicToolbar.qml	2014-06-20 21:49:43 +0000
@@ -550,6 +550,7 @@
                 /* Progress bar */
                 Rectangle {
                     id: musicToolbarFullProgressBarContainer
+                    objectName: "progressBarShape"
                     anchors.left: musicToolbarFullPositionLabel.right
                     anchors.leftMargin: units.gu(2)
                     anchors.right: musicToolbarFullDurationLabel.left
 
=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2014-05-23 15:00:21 +0000
+++ tests/autopilot/music_app/emulators.py	2014-06-20 21:49:43 +0000
@@ -39,6 +39,17 @@
         sleep(2)
         self.pointing_device.release()
 
+    def seek_to_0(self):
+        # Get the progress bar object
+        progressBar = self.wait_select_single(
+            "*", objectName="progressBarShape")
+
+        # Move to the progress bar and get the position
+        self.pointing_device.move_to_object(progressBar)
+        x1, y1 = self.pointing_device.position()
+
+        self.pointing_device.drag(x1, y1, x1 - (progressBar.width / 2) + 1, y1)
+
     def show_toolbar(self):
         # Get the toolbar object and create a mouse
         toolbar = self.get_toolbar()
 
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-06-18 23:32:17 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-06-20 21:49:43 +0000
@@ -203,6 +203,9 @@
         nextArtist = self.player.currentMetaArtist
         logger.debug("Next Song %s, %s" % (nextTitle, nextArtist))
 
+        """ Seek to 0 """
+        self.main_view.seek_to_0()
+
         """ Select previous """
         previousbutton = self.main_view.get_previous_button()
         self.pointing_device.click_object(previousbutton)