Merge lp:~nskaggs/dropping-letters/new-pep8-fixes into lp:dropping-letters

[Nicholas Skaggs]

Fixes for new pep8 requirements

Fixes for new pep8 requirements

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

FAILED: Continuous integration, rev:54
http://91.189.93.70:8080/job/dropping-letters-ci/24/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/dropping-letters-utopic-amd64-ci/2/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/694/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/dropping-letters/new-pep8-fixes]

55. By Nicholas Skaggs on 2014-06-27

fix E501 line too long

[Julia Palandri (julia-palandri)]

LGTM

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/dropping_letters_app/emulators.py'
--- tests/autopilot/dropping_letters_app/emulators.py	2013-10-28 13:22:42 +0000
+++ tests/autopilot/dropping_letters_app/emulators.py	2014-06-27 15:53:00 +0000
@@ -37,15 +37,16 @@
         return item
 
     def get_help_popover(self):
-        #checking the popup seems to fail
+        # checking the popup seems to fail
         # -- https://bugs.launchpad.net/autopilot/+bug/1195141?
-        #we can't get the popup by objectname for ??
-        #this works OK because at the moment, there is only one popup
+        # we can't get the popup by objectname for ??
+        # this works OK because at the moment, there is only one popup
         #  -- needs fixed
-        #item = self.select_single('Label', objectname='helpsheetpopoverlabel')
-        #item = self.select_single('QQuickRectangle',
+        # item = self.select_single('Label',
+        #                           objectname='helpsheetpopoverlabel')
+        # item = self.select_single('QQuickRectangle',
         #                          objectname='helpsheetpopoverbox')
-        #item = self.select_single('Popover', objectname='helpsheetpopover')
+        # item = self.select_single('Popover', objectname='helpsheetpopover')
 
         item = self.wait_select_single('Popover')
         return item

=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2013-10-28 13:22:42 +0000
+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py	2014-06-27 15:53:00 +0000
@@ -38,18 +38,18 @@
 
     def test_intro_screen(self):
         helpbutton = self.main_view.get_help_button()
-        #check help button popup
+        # check help button popup
         self.assertTrue(helpbutton.visible)
 
-        #open the popup
+        # open the popup
         self.pointing_device.click_object(helpbutton)
 
-        #check and ensure help popover appears
+        # check and ensure help popover appears
         helpPopover = self.main_view.get_help_popover()
         properties = helpPopover.get_properties()
         self.assertTrue(properties["visible"])
 
-        #check and ensure help popover disappears
+        # check and ensure help popover disappears
         self.pointing_device.click_object(helpbutton)
         self.assertThat(self.main_view.get_many_popover,
                         Eventually(Equals([])))
@@ -62,23 +62,23 @@
         self.assertEquals(main_score_label.text, '0')
 
     def test_finishing_a_word(self):
-        #start game and close toolbar
+        # start game and close toolbar
         toolbar = self.main_view.open_toolbar()
         toolbar.click_button('new_game')
         self._assert_game_screen()
         toolbar = self.main_view.close_toolbar()
 
-        #check for letters falling
-        #select first 2 letters; wait for 3 letters to appear
-        #so first 2 are settled for clicking
+        # check for letters falling
+        # select first 2 letters; wait for 3 letters to appear
+        # so first 2 are settled for clicking
         tiles = self.main_view.get_letter_tiles()
         while len(tiles) < 3:
             tiles = self.main_view.get_letter_tiles()
 
-        #click the accumlated letters
-        #check and make sure they get selected
-        #add tries as a control to avoid infinite loop
-        #and provide better failure feedback
+        # click the accumlated letters
+        # check and make sure they get selected
+        # add tries as a control to avoid infinite loop
+        # and provide better failure feedback
         tries = 0
         self.pointing_device.click_object(tiles[0])
         tileProperties = tiles[0].get_properties()
@@ -101,19 +101,19 @@
 
         self.assertThat(tries, LessThan(10))
 
-        #check the text to make sure it's the same
+        # check the text to make sure it's the same
         wordValue = tiles[0].containedLetter + tiles[1].containedLetter
         word = self.main_view.get_word_label()
         self.assertEquals(word.text, wordValue)
 
-        #click to complete word
+        # click to complete word
         validWord = word.isValid
         self.pointing_device.click_object(word)
 
-        #depending on if the property isValid is true or not,
-        #score should increase or stay the same after completion
-        #we don't need to get fancy, since the start value is 0;
-        #check for zero or non-zero score
+        # depending on if the property isValid is true or not,
+        # score should increase or stay the same after completion
+        # we don't need to get fancy, since the start value is 0;
+        # check for zero or non-zero score
         main_score_label = self.main_view.get_main_score_label()
         if validWord:
             self.assertNotEquals(main_score_label.text, '0')