Merge lp:~popey/ubuntu-terminal-app/fix-1317198 into lp:ubuntu-terminal-app

[Alan Pope 🍺🐧🐱 🦄]

Fixup pep8 and pyflakes errors.

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

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/59/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2718
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/255
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/47
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/3

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/59/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2014-03-05 16:10:04 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2014-05-20 15:04:24 +0000
@@ -21,6 +21,7 @@
 
 
 class MainView(toolkit_emulators.MainView):
+
     """Terminal MainView Autopilot emulator."""
 
     def get_main_view(self):
@@ -53,7 +54,8 @@
 
     def get_panel_actions_popover(self):
         """Return the ActionSelectionPopover emulator of the popup action."""
-        return self.wait_select_single(ActionSelectionPopover, objectName='panelpopover')
+        return self.wait_select_single(ActionSelectionPopover,
+                                       objectName='panelpopover')
 
     def drag_horizontal_slider(self, slider, pos):
         """Drag slider until value is set"""
@@ -72,27 +74,30 @@
 
         x, y, w, h = slRect.globalRect
         # calculate the approximate slide step width
-        # we take half of the theoretical step value just to make sure we don't miss any values
+        # we take half of the theoretical step value just to make
+        # sure we don't miss any values
         step = w / ((slideMax - slideMin) * 2)
         sx = x + step
         sy = y + h / 2
         loop = 1
 
-        #set the slider to minimum value and loop
+        # set the slider to minimum value and loop
         self.pointing_device.move(sx, sy)
         self.pointing_device.click()
 
-        #drag through the slider until the pos matches our desired value
-        #in case of bad sliding, loop will also timeout
-        while round(slItem.value) != pos and slItem.value<slideMax and loop<=(slideMax*2):
-            valuePos = int(sx + step)
-            self.pointing_device.drag(sx, sy, valuePos, sy)
-            sx = valuePos
-            sleep(0.3)
-            loop = loop + 1
+        # drag through the slider until the pos matches our desired value
+        # in case of bad sliding, loop will also timeout
+        while round(slItem.value) != pos and slItem.value < slideMax \
+                and loop <= (slideMax * 2):
+                valuePos = int(sx + step)
+                self.pointing_device.drag(sx, sy, valuePos, sy)
+                sx = valuePos
+                sleep(0.3)
+                loop = loop + 1
 
 
 class ActionSelectionPopover(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
     """ActionSelectionPopover Autopilot emulator."""
     # TODO Move this to the ubuntu-ui-toolkit. Reported on
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205205

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-02-27 17:17:02 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-05-20 15:04:24 +0000
@@ -19,6 +19,7 @@
 import unittest
 import random
 
+
 class TestMainWindow(TerminalTestCase, DbMan):
 
     def setUp(self):
@@ -36,12 +37,13 @@
         toolbar.click_button("PanelsButton")
         panel_popover = self.main_view.get_panel_actions_popover()
 
-        #we have to poll the complex action because we can't check the animation for the header
-        while panel_popover == None and timeout < 10:
+        # we have to poll the complex action because
+        # we can't check the animation for the header
+        while panel_popover is None and timeout < 10:
             toolbar.click_button("PanelsButton")
             panel_popover = self.main_view.get_panel_actions_popover()
             sleep(1)
-            timeout+=1
+            timeout += 1
         panel_popover.click_button("Hide extra panel")
 
     def click_item_selector_item(self, selector, value):
@@ -50,14 +52,21 @@
         # ListItem.ItemSelector {
         #    objectName:
         #    model:
-        self.assertThat(lambda: self.main_view.select_single("ItemSelector", objectName=selector), Eventually(Not(Is(None))))
-        item_selector = self.main_view.select_single("ItemSelector", objectName=selector)
-        #we need to regrab object as for some reason it can sometimes change and our ordering will be off down below
-        self.assertThat(lambda: self.main_view.select_single("ItemSelector", objectName=selector), Eventually(Not(Is(None))))
-        item_selector = self.main_view.select_single("ItemSelector", objectName=selector)
-        self.assertThat(lambda: item_selector.select_many("QQuickColumn"), Eventually(Not(Is(None))))
+        self.assertThat(lambda: self.main_view.select_single("ItemSelector",
+                        objectName=selector), Eventually(Not(Is(None))))
+        item_selector = self.main_view.select_single("ItemSelector",
+                                                     objectName=selector)
+        # we need to regrab object as for some reason it can sometimes
+        # change and our ordering will be off down below
+        self.assertThat(lambda: self.main_view.select_single("ItemSelector",
+                        objectName=selector), Eventually(Not(Is(None))))
+        item_selector = self.main_view.select_single("ItemSelector",
+                                                     objectName=selector)
+        self.assertThat(lambda: item_selector.select_many("QQuickColumn"),
+                        Eventually(Not(Is(None))))
         rows = item_selector.select_many("QQuickColumn")
-        self.assertThat(lambda: rows[0].select_single("QQuickListView", objectName="listView"), Eventually(Not(Is(None))))
+        self.assertThat(lambda: rows[0].select_single("QQuickListView",
+                        objectName="listView"), Eventually(Not(Is(None))))
         items = rows[0].select_single("QQuickListView", objectName="listView")
         self.pointing_device.click_object(items)
         for ritem in items:
@@ -114,8 +123,8 @@
         on long tap"""
         kterm = self.main_view.get_terminal_page()
         x, y, w, h = kterm.globalRect
-        tap_x = (x + w ) / 2
-        tap_y = (y + h ) / 3
+        tap_x = (x + w) / 2
+        tap_y = (y + h) / 3
 
         #tap in the top third of the screen, to avoid OSK
         self.pointing_device.move(tap_x, tap_y)
@@ -146,44 +155,42 @@
         #are these string translatable?
         #if so, we need to do this another way
         schemeList = ("DarkPastels",
-            "Linux",
-            "BlackOnRandomLight",
-            "BlackOnWhite",
-            "BlackOnLightYellow",
-            "GreenOnBlack",
-            "WhiteOnBlack",
-            )
+                      "Linux",
+                      "BlackOnRandomLight",
+                      "BlackOnWhite",
+                      "BlackOnLightYellow",
+                      "GreenOnBlack",
+                      "WhiteOnBlack")
 
         for scheme in schemeList:
-            self.click_item_selector_item("liSchemes",scheme)
+            self.click_item_selector_item("liSchemes", scheme)
             # This assert uses KTerminalDisplay property (old rev)
             self.assertThat(kterm.colorScheme, Eventually(Equals(scheme)))
             # This assert uses localstorage (new rev)
             colorScheme = self.get_color_scheme_from_storage
             self.assertThat(colorScheme, Eventually(Equals(scheme)))
 
-
     def test_font_size_changes(self):
         """Make sure that font size is set correctly"""
         toolbar = self.main_view.open_toolbar()
         toolbar.click_button("SettingsButton")
 
         # change font size to max
-        self.main_view.drag_horizontal_slider("slFont",32)
+        self.main_view.drag_horizontal_slider("slFont", 32)
         sleep(1)
         font_size = self.get_font_size_from_storage()
         self.assertThat(font_size, Equals(32))
 
         ## change font size to min
-        self.main_view.drag_horizontal_slider("slFont",8)
+        self.main_view.drag_horizontal_slider("slFont", 8)
         sleep(1)
         font_size = self.get_font_size_from_storage()
         self.assertThat(font_size, Equals(8))
 
         ## change font size to random sizes
-        for loop in range(1,3):
-            randSize = random.randrange(8,32,1)
-            self.main_view.drag_horizontal_slider("slFont",randSize)
+        for loop in range(1, 3):
+            randSize = random.randrange(8, 32, 1)
+            self.main_view.drag_horizontal_slider("slFont", randSize)
             sleep(1)
             font_size = self.get_font_size_from_storage()
             self.assertThat(font_size, Equals(randSize))