Merge lp:~ahayzen/music-app/pep8-update-fixes into lp:music-app/trusty

[Andrew Hayzen]

* Fix Pep8 after update

* Fix Pep8 after update

PEP8 has been updated in utopic causing some styling to fail.

[lp:~ahayzen/music-app/pep8-update-fixes]

504. By Andrew Hayzen on 2014-06-24

* Fix for incorrect formatting of string

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

FAILED: Continuous integration, rev:503
http://91.189.93.70:8080/job/music-app-ci/891/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/620
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/115

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:504
http://91.189.93.70:8080/job/music-app-ci/892/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/623
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/116

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

So many comment changes :-)

=== modified file 'tests/autopilot/music_app/emulators.py'
--- tests/autopilot/music_app/emulators.py	2014-06-20 21:49:33 +0000
+++ tests/autopilot/music_app/emulators.py	2014-06-24 23:50:34 +0000
@@ -66,16 +66,16 @@
         # switch to albums tab
         self.switch_to_tab("albumstab")
 
-        #select album
+        # select album
         albumartist = self.get_albums_albumartist(artistName)
         self.pointing_device.click_object(albumartist)
 
-        #get track item to add to queue
+        # get track item to add to queue
         trackicon = self.get_album_sheet_listview_trackicon(
             trackTitle)
         self.pointing_device.click_object(trackicon)
 
-        #click on Add to queue
+        # click on Add to queue
         queueTrackLabel = self.get_album_sheet_queuetrack_label()
         self.pointing_device.click_object(queueTrackLabel)
 

=== modified file 'tests/autopilot/music_app/tests/__init__.py'
--- tests/autopilot/music_app/tests/__init__.py	2014-06-19 01:47:36 +0000
+++ tests/autopilot/music_app/tests/__init__.py	2014-06-24 23:50:34 +0000
@@ -85,23 +85,23 @@
 
         launch, self.test_type = self.setup_environment()
 
-        #Use backup and restore to setup test environment
+        # Use backup and restore to setup test environment
         #################################################
-        #for now, we will use real /home
+        # for now, we will use real /home
         logger.debug("Backup root folder %s" % self.backup_root)
 
-        #backup and wipe before testing
+        # backup and wipe before testing
         sqlite_dir = os.path.join(
             os.environ.get('HOME'), '.local/share/com.ubuntu.music/Databases')
         self.backup_folder(sqlite_dir)
         self.addCleanup(lambda: self.restore_folder(sqlite_dir))
 
-        #backup Music folder and restore it after testing
+        # backup Music folder and restore it after testing
         self.backup_folder(os.path.join(os.environ.get('HOME'), 'Music'))
         self.addCleanup(lambda: self.restore_folder(
                         os.path.join(os.environ.get('HOME'), 'Music')))
 
-        #backup mediascanner folder and restore it after testing
+        # backup mediascanner folder and restore it after testing
         self.backup_folder(os.path.join(os.environ.get('HOME'),
                                         '.cache/mediascanner-2.0'))
         self.addCleanup(lambda: self.restore_folder(os.path.join(
@@ -110,43 +110,46 @@
 
         self.home_dir = os.environ['HOME']
         self._create_music_library()
+
+        '''
         #################################################
-        #Use backup and restore to setup test environment
-
-        #Use mocking fakehome
-        #####################
-        #self.home_dir = self._patch_home()
-
-        #self._create_music_library()
-
-        ##we need to also tell upstart about our fake home
-        ##and we need to do this all in one shell,
-        ##also passing along our fake env (env=env)
-        #logger.debug("Launching mediascanner")
-        #env = os.environ.copy()
-        #sethome = "initctl set-env HOME=" + self.home_dir
-        #retcode = subprocess.check_output(sethome + "; \
-                                          #start mediascanner-2.0",
-                                          #env=env,
-                                          #stderr=subprocess.STDOUT,
-                                          #shell=True)
-        #logger.debug("mediascanner launched %s" % retcode)
-        #time.sleep(10)
-
-        #logger.debug("Launching mediascanner-dbus")
-        #retcode = subprocess.call(
-            #"/usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0 &",
-            #env=env, stderr=subprocess.STDOUT, shell=True)
-        #logger.debug("mediascanner-dbus launched %s" % retcode)
-
-        ##we attempt to reset home for future upstart jobs
-        #retcode = subprocess.check_output("initctl reset-env",
-                                          #env=env, shell=True)
-        #retcode = subprocess.check_output("initctl get-env HOME",
-                                          #env=env, shell=True)
-        #logger.debug("reset initctl home %s" % retcode)
-        #####################
-        #Use mocking fakehome
+        # Use backup and restore to setup test environment
+
+        # Use mocking fakehome
+        #####################
+        self.home_dir = self._patch_home()
+
+        self._create_music_library()
+
+        # we need to also tell upstart about our fake home
+        # and we need to do this all in one shell,
+        # also passing along our fake env (env=env)
+        logger.debug("Launching mediascanner")
+        env = os.environ.copy()
+        sethome = "initctl set-env HOME=" + self.home_dir
+        retcode = subprocess.check_output(sethome + "; \
+                                          start mediascanner-2.0",
+                                          env=env,
+                                          stderr=subprocess.STDOUT,
+                                          shell=True)
+        logger.debug("mediascanner launched %s" % retcode)
+        time.sleep(10)
+
+        logger.debug("Launching mediascanner-dbus")
+        retcode = subprocess.call(
+            "/usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0 &",
+            env=env, stderr=subprocess.STDOUT, shell=True)
+        logger.debug("mediascanner-dbus launched %s" % retcode)
+
+        # we attempt to reset home for future upstart jobs
+        retcode = subprocess.check_output("initctl reset-env",
+                                          env=env, shell=True)
+        retcode = subprocess.check_output("initctl get-env HOME",
+                                          env=env, shell=True)
+        logger.debug("reset initctl home %s" % retcode)
+        #####################
+        # Use mocking fakehome
+        '''
 
         self.pointing_device = Pointer(self.input_device_class.create())
         super(MusicTestCase, self).setUp()
@@ -179,10 +182,10 @@
     def _copy_xauthority_file(self, directory):
         """ Copy .Xauthority file to directory, if it exists in /home
         """
-        #If running under xvfb, as jenkins does,
-        #xsession will fail to start without xauthority file
-        #Thus if the Xauthority file is in the home directory
-        #make sure we copy it to our temp home directory
+        # If running under xvfb, as jenkins does,
+        # xsession will fail to start without xauthority file
+        # Thus if the Xauthority file is in the home directory
+        # make sure we copy it to our temp home directory
 
         xauth = os.path.expanduser(os.path.join(os.environ.get('HOME'),
                                    '.Xauthority'))
@@ -196,8 +199,8 @@
     def _patch_home(self):
         """ mock /home for testing purposes to preserve user data
         """
-        #click requires apparmor profile, and writing to special dir
-        #but the desktop can write to a traditional /tmp directory
+        # click requires apparmor profile, and writing to special dir
+        # but the desktop can write to a traditional /tmp directory
         if self.test_type == 'click':
             env_dir = os.path.join(os.environ.get('HOME'), 'autopilot',
                                    'fakeenv')
@@ -208,8 +211,8 @@
             temp_dir_fixture = fixtures.TempDir(env_dir)
             self.useFixture(temp_dir_fixture)
 
-            #apparmor doesn't allow the app to create needed directories,
-            #so we create them now
+            # apparmor doesn't allow the app to create needed directories,
+            # so we create them now
             temp_dir = temp_dir_fixture.path
             temp_dir_cache = os.path.join(temp_dir, '.cache')
             temp_dir_cache_font = os.path.join(temp_dir_cache, 'fontconfig')
@@ -242,7 +245,7 @@
             if not os.path.exists(temp_dir_confined):
                 os.makedirs(temp_dir_confined)
 
-            #before we set fixture, copy xauthority if needed
+            # before we set fixture, copy xauthority if needed
             self._copy_xauthority_file(temp_dir)
             self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
                             HOME=temp_dir))
@@ -251,7 +254,7 @@
             self.useFixture(temp_dir_fixture)
             temp_dir = temp_dir_fixture.path
 
-            #before we set fixture, copy xauthority if needed
+            # before we set fixture, copy xauthority if needed
             self._copy_xauthority_file(temp_dir)
             self.useFixture(fixtures.EnvironmentVariable('HOME',
                                                          newvalue=temp_dir))
@@ -270,13 +273,13 @@
             os.makedirs(musicpath)
         logger.debug("Mediascanner path set to %s" % mediascannerpath)
 
-        #set content path
+        # set content path
         content_dir = os.path.join(os.path.dirname(music_app.__file__),
                                    'content')
 
         logger.debug("Content dir set to %s" % content_dir)
 
-        #copy content
+        # copy content
         shutil.copy(os.path.join(content_dir, '1.ogg'), musicpath)
         shutil.copy(os.path.join(content_dir, '2.ogg'), musicpath)
         shutil.copy(os.path.join(content_dir, '3.mp3'), musicpath)
@@ -292,9 +295,9 @@
             str(os.listdir(mediascannerpath)))
 
     def _patch_mediascanner_home(self, mediascannerpath):
-        #do some inline db patching
-        #patch mediaindex to proper home
-        #these values are dependent upon our sampled db
+        # do some inline db patching
+        # patch mediaindex to proper home
+        # these values are dependent upon our sampled db
         logger.debug("Patching fake mediascanner database in %s" %
                      mediascannerpath)
         logger.debug(
@@ -303,7 +306,7 @@
 
         relhome = self.home_dir[1:]
         dblocation = "home/phablet"
-        #patch mediaindex
+        # patch mediaindex
         self._file_find_replace(mediascannerpath +
                                 "/mediastore.sql", dblocation, relhome)
 
@@ -315,8 +318,8 @@
         con.close()
 
     def _file_find_replace(self, in_filename, find, replace):
-        #replace all occurences of string find with string replace
-        #in the given file
+        # replace all occurences of string find with string replace
+        # in the given file
         out_filename = in_filename + ".tmp"
         infile = open(in_filename, 'rb')
         outfile = open(out_filename, 'wb')
@@ -325,7 +328,7 @@
         infile.close()
         outfile.close()
 
-        #remove original file and copy new file back
+        # remove original file and copy new file back
         os.remove(in_filename)
         os.rename(out_filename, in_filename)
 

=== modified file 'tests/autopilot/music_app/tests/test_music.py'
--- tests/autopilot/music_app/tests/test_music.py	2014-06-20 21:45:24 +0000
+++ tests/autopilot/music_app/tests/test_music.py	2014-06-24 23:50:34 +0000
@@ -27,7 +27,7 @@
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-        #wait for activity indicator to stop spinning
+        # 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"
@@ -111,12 +111,12 @@
         endtracksCount = self.main_view.get_queue_track_count()
         self.assertThat(endtracksCount, Equals(initialtracksCount + 1))
 
-        #Assert that the song added to the list is not playing
+        # Assert that the song added to the list is not playing
         self.assertThat(self.player.currentIndex,
                         Eventually(NotEquals(endtracksCount)))
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
-        #verify song's metadata matches the item added to the Now Playing view
+        # verify song's metadata matches the item added to the Now Playing view
         queueArtistName = self.main_view.get_queue_now_playing_artist(
             self.artistName)
         self.assertThat(queueArtistName.text, Equals(self.artistName))
@@ -176,7 +176,7 @@
         orgTitle = self.player.currentMetaTitle
         orgArtist = self.player.currentMetaArtist
 
-        #check original track
+        # check original track
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
         logger.debug("Original Song %s, %s" % (orgTitle, orgArtist))
 
@@ -187,7 +187,7 @@
         self.turn_shuffle_off()
 
         """ Select next """
-        #goal is to go back and forth and ensure 2 different songs
+        # goal is to go back and forth and ensure 2 different songs
         forwardbutton = self.main_view.get_forward_button()
         self.pointing_device.click_object(forwardbutton)
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
@@ -196,7 +196,7 @@
         self.pointing_device.click_object(playbutton)
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
-        #ensure different song
+        # ensure different song
         self.assertThat(title, Eventually(NotEquals(orgTitle)))
         self.assertThat(artist, Eventually(NotEquals(orgArtist)))
         nextTitle = self.player.currentMetaTitle
@@ -215,7 +215,7 @@
         self.pointing_device.click_object(playbutton)
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
-        #ensure we're back to original song
+        # ensure we're back to original song
         self.assertThat(title, Eventually(Equals(orgTitle)))
         self.assertThat(artist, Eventually(Equals(orgArtist)))
 
@@ -234,8 +234,8 @@
 
         """ Track is playing """
         count = 1
-        #ensure track appears before looping through queue more than once
-        #needs to contain test mp3 metadata and end in *.mp3
+        # ensure track appears before looping through queue more than once
+        # needs to contain test mp3 metadata and end in *.mp3
         queue = self.main_view.get_queue_track_count()
         while title != "TestMP3Title" and artist != "TestMP3Artist":
             self.assertThat(count, LessThan(queue))
@@ -256,7 +256,7 @@
 
             count = count + 1
 
-        #make sure mp3 plays
+        # make sure mp3 plays
         self.assertThat(self.player.source.endswith("mp3"),
                         Equals(True))
         self.pointing_device.click_object(playbutton)
@@ -273,7 +273,7 @@
         playbutton = self.main_view.get_now_playing_play_button()
         previousbutton = self.main_view.get_previous_button()
 
-        #play for a second, then pause
+        # play for a second, then pause
         if not self.player.isPlaying:
             logger.debug("Play not selected")
             self.pointing_device.click_object(playbutton)
@@ -289,10 +289,10 @@
         while True:
             self.assertThat(count, LessThan(100))
 
-            #goal is to hit next under shuffle mode
-            #then verify original track is not the previous track
-            #this means a true shuffle happened
-            #if it doesn't try again, up to count times
+            # goal is to hit next under shuffle mode
+            # then verify original track is not the previous track
+            # this means a true shuffle happened
+            # if it doesn't try again, up to count times
 
             orgTitle = self.player.currentMetaTitle
             orgArtist = self.player.currentMetaArtist
@@ -310,8 +310,8 @@
             artist = self.player.currentMetaArtist
             logger.debug("Current Song %s, %s" % (title, artist))
 
-            #go back to previous and check against original
-            #play song, then pause before switching
+            # go back to previous and check against original
+            # play song, then pause before switching
             time.sleep(1)
             self.pointing_device.click_object(playbutton)
             self.assertThat(self.player.isPlaying,
@@ -325,7 +325,7 @@
             artist = self.player.currentMetaArtist
 
             if title != orgTitle and artist != orgArtist:
-                #we shuffled properly
+                # we shuffled properly
                 logger.debug("Yay, shuffled %s, %s" % (title, artist))
                 break
             else:
@@ -338,11 +338,11 @@
         # switch to albums tab
         self.main_view.switch_to_tab("albumstab")
 
-        #select album
+        # select album
         albumartist = self.main_view.get_albums_albumartist(self.artistName)
         self.pointing_device.click_object(albumartist)
 
-        #get album sheet album artist
+        # get album sheet album artist
         sheet_albumartist = self.main_view.get_album_sheet_artist()
         self.assertThat(sheet_albumartist.text, Equals(self.artistName))
 
@@ -364,12 +364,12 @@
         endtracksCount = self.main_view.get_queue_track_count()
         self.assertThat(endtracksCount, Equals(initialtracksCount + 1))
 
-        #Assert that the song added to the list is not playing
+        # Assert that the song added to the list is not playing
         self.assertThat(self.player.currentIndex,
                         Eventually(NotEquals(endtracksCount)))
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
-        #verify song's metadata matches the item added to the Now Playing view
+        # verify song's metadata matches the item added to the Now Playing view
         queueArtistName = self.main_view.get_queue_now_playing_artist(
             self.artistName)
         self.assertThat(queueArtistName.text, Equals(self.artistName))
@@ -494,11 +494,11 @@
         # switch to artists tab
         self.main_view.switch_to_tab("artiststab")
 
-        #select artist
+        # select artist
         artist = self.main_view.get_artists_artist(self.artistName)
         self.pointing_device.click_object(artist)
 
-        #get album sheet album artist
+        # get album sheet album artist
         sheet_albumartist = self.main_view.get_artist_sheet_artist()
         self.assertThat(sheet_albumartist.text, Equals(self.artistName))
 
@@ -506,14 +506,14 @@
         sheet_albumartist = self.main_view.get_artist_sheet_artist_cover()
         self.pointing_device.click_object(sheet_albumartist)
 
-        #get song sheet album artist
+        # get song sheet album artist
         sheet_albumartist = self.main_view.get_album_sheet_artist()
         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
+        # select artist
         track = self.main_view.get_album_sheet_listview_tracktitle(
             self.trackTitle)
         self.pointing_device.click_object(track)
@@ -580,12 +580,12 @@
 
         num_tracks = self.main_view.get_queue_track_count()
 
-        #Skip through all songs in queue, stopping on last one.
+        # Skip through all songs in queue, stopping on last one.
         forward_button = self.main_view.get_forward_button()
         for count in range(0, num_tracks - 1):
             self.pointing_device.click_object(forward_button)
 
-        #When the last song ends, playback should stop
+        # When the last song ends, playback should stop
         self.assertThat(self.player.isPlaying, Eventually(Equals(False)))
 
     def test_playback_repeats_when_last_song_ends_and_repeat_on(self):
@@ -598,12 +598,12 @@
         self.turn_repeat_on()
 
         num_titles = self.main_view.get_queue_track_count()
-        #Skip through all songs in queue, stopping on last one.
+        # Skip through all songs in queue, stopping on last one.
         forward_button = self.main_view.get_forward_button()
         for count in range(0, num_titles - 1):
             self.pointing_device.click_object(forward_button)
 
-        #Make sure we loop back to first song after last song ends
+        # Make sure we loop back to first song after last song ends
         actual_title = lambda: self.player.currentMetaTitle
         self.assertThat(actual_title, Eventually(Equals(self.trackTitle)))
         self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
@@ -618,7 +618,7 @@
         self.turn_repeat_on()
 
         num_titles = self.main_view.get_queue_track_count()
-        #Skip through all songs in queue, INCLUDING last one.
+        # Skip through all songs in queue, INCLUDING last one.
         forward_button = self.main_view.get_forward_button()
         for count in range(0, num_titles - 1):
             self.pointing_device.click_object(forward_button)
@@ -639,9 +639,9 @@
         prev_button = self.main_view.get_previous_button()
         initial_song = self.player.currentMetaTitle
         self.pointing_device.click_object(prev_button)
-        #If we're far enough into a song, pressing prev just takes us to the
-        #beginning of that track.  In that case, hit prev again to actually
-        #skip over the track.
+        # If we're far enough into a song, pressing prev just takes us to the
+        # beginning of that track.  In that case, hit prev again to actually
+        # skip over the track.
         if self.player.currentMetaTitle == initial_song:
             self.pointing_device.click_object(prev_button)