Ubuntu Music App

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

  1. fix-failing-test
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 564
Merged at revision: 565
Proposed branch: lp:~vthompson/music-app/fix-failing-test
Merge into: lp:music-app/trusty
Diff against target: 12 lines (+0/-2)
1 file modified
tests/autopilot/music_app/tests/test_music.py (+0/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-failing-test
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+230562@code.launchpad.net

Commit message

Fix failing test (test_add_song_to_queue_from_albums_page) in trunk

Description of the change

Currently there's a failing test in trunk (test_add_song_to_queue_from_albums_page). This seems to be due to the currentIndex being set when an item is added to the queue. This check isn't needed--it is fine that the new track is the currentIndex.

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:564
http://91.189.93.70:8080/job/music-app-ci/1007/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1498
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1498/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/231

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

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

Approving as we are likely to be refactoring the tests soon anyway and this resolves the issue.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/music_app/tests/test_music.py'
2--- tests/autopilot/music_app/tests/test_music.py 2014-08-07 20:57:06 +0000
3+++ tests/autopilot/music_app/tests/test_music.py 2014-08-13 01:35:25 +0000
4@@ -363,8 +363,6 @@
5 Eventually(Equals(initialtracksCount + 1)))
6
7 # Assert that the song added to the list is not playing
8- self.assertThat(self.player.currentIndex,
9- Eventually(NotEquals(endtracksCount)))
10 self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
11
12 # verify song's metadata matches the item added to the Now Playing view

Subscribers

People subscribed via source and target branches

to status/vote changes: