Merge lp:~jibel/ubiquity/fix_pep8_autopilot into lp:ubiquity

[Jean-Baptiste Lallement]

pep8 compliance of autopilot tests

This patch fixes autopilot tests to be pep8 compliant and adds the directory autopilot/ to tests/run-pep8.

I essentially changed line width (244 errors over 261 initially reported).
I ran debian/rules clean and both run-pep8 and run-pyflakes tests pass. I also tried Ubuntu Desktop non-english and Xubuntu Desktop english and they succeeded.

[Dan Chapman  (dpniel)]

LGTM, i've changed the warnings in my editor so this shouldn't happen again. Thanks for cleaning it up :-)

review: Approve

=== modified file 'autopilot/ubiquity_autopilot_tests/configs/default_install.py'
--- autopilot/ubiquity_autopilot_tests/configs/default_install.py	2013-11-06 11:22:15 +0000
+++ autopilot/ubiquity_autopilot_tests/configs/default_install.py	2013-11-19 09:56:21 +0000
@@ -7,4 +7,3 @@
 hidden_options = ['reuse_partition', 'reuse_partition_desc',
                   'resize_use_free', 'resize_use_free_desc',
                   'replace_partition', 'replace_partition_desc']
-

=== modified file 'autopilot/ubiquity_autopilot_tests/configs/eng_label_values.py'
--- autopilot/ubiquity_autopilot_tests/configs/eng_label_values.py	2013-11-14 14:16:45 +0000
+++ autopilot/ubiquity_autopilot_tests/configs/eng_label_values.py	2013-11-19 09:56:21 +0000
@@ -27,16 +27,20 @@
 distro_flavor = get_distribution()
 
 stepLanguage = {
-    "release_notes_label": 'You may wish to read the <a href="release-notes">release notes</a>.',
+    "release_notes_label": 'You may wish to read the <a href="release-notes">'
+    'release notes</a>.',
     "page_title": 'page_title= <span size="xx-large">Welcome</span>'
 }
 
 stepPrepare = {
-    "page_title": '<span size="xx-large">Preparing to install {0}</span>'.format(distro_flavor),
-    "prepare_best_results": 'For best results, please ensure that this computer:',
-    "prepare_foss_disclaimer": 'Ubuntu uses third-party software to play Flash, MP3 and other media, and to work with \
-    some graphics and wi-fi hardware. Some of this software is proprietary. The software is subject to license terms \
-    included with its documentation.',
+    "page_title": '<span size="xx-large">Preparing to install {0}</span>'
+    .format(distro_flavor),
+    "prepare_best_results": 'For best results, please ensure that this '
+    'computer:',
+    "prepare_foss_disclaimer": 'Ubuntu uses third-party software to play '
+    'Flash, MP3 and other media, and to work with some graphics and wi-fi '
+    'hardware. Some of this software is proprietary. The software is subject '
+    'to license terms included with its documentation.',
     "prepare_download_updates": 'Download updates while installing',
     "prepare_nonfree_software": 'Install this third-party software',
     "prepare_network_connection": 'is connected to the Internet',
@@ -47,16 +51,18 @@
 stepPartAsk = {
     "page_title": '<span size="xx-large">Installation type</span>',
     "use_device": 'Erase disk and install {0}'.format(distro_flavor),
-    "use_device_desc": '<span size="small"><span foreground="darkred">Warning:</span> \
-    This will delete any files on the disk.</span>',
+    "use_device_desc": '<span size="small"><span foreground="darkred">'
+    'Warning:</span> This will delete any files on the disk.</span>',
     "use_crypto": 'Encrypt the new Ubuntu installation for security',
-    "use_crypto_desc": '<span size="small">You will choose a security key in the next step.</span>',
+    "use_crypto_desc": '<span size="small">You will choose a security key in '
+    'the next step.</span>',
     "use_lvm": 'Use LVM with the new Ubuntu installation',
-    "use_lvm_desc": '<span size="small">This will set up Logical Volume Management. It allows taking snapshots and \
-    easier partition resizing.</span>',
+    "use_lvm_desc": '<span size="small">This will set up Logical Volume '
+    'Management. It allows taking snapshots and easier partition '
+    'resizing.</span>',
     "custom_partitioning": 'Something else',
-    "custom_partitioning_desc": '<span size="small">You can create or resize partitions yourself, or choose multiple \
-    partitions for Ubuntu.</span>'
+    "custom_partitioning_desc": '<span size="small">You can create or resize '
+    'partitions yourself, or choose multiple partitions for Ubuntu.</span>'
 }
 
 
@@ -64,13 +70,16 @@
     "page_title": '<span size="xx-large">Choose a security key:</span>',
     "verified_crypto_label": 'Confirm the security key:',
     "crypto_label": 'Choose a security key:',
-    "crypto_description": 'Disk encryption protects your files in case you lose your computer. It requires you to \
-    enter a security key each time the computer starts up.',
-    "crypto_warning": '<span foreground="darkred">Warning:</span> If you lose this security key, all data will be \
-    lost. If you need to, write down your key and keep it in a safe place elsewhere.',
+    "crypto_description": 'Disk encryption protects your files in case you '
+    'lose your computer. It requires you to enter a security key each time '
+    'the computer starts up.',
+    "crypto_warning": '<span foreground="darkred">Warning:</span> If you lose '
+    'this security key, all data will be lost. If you need to, write down '
+    'your key and keep it in a safe place elsewhere.',
     "crypto_extra_label": 'For more security:',
     "crypto_extra_time": 'The installation may take much longer.',
-    "crypto_description_2": 'Any files outside of Ubuntu will not be encrypted.',
+    "crypto_description_2": 'Any files outside of Ubuntu will not be '
+    'encrypted.',
     "crypto_overwrite_space": 'Overwrite empty disk space'
 }
 
@@ -88,5 +97,6 @@
     "username_label": 'Pick a username:',
     "password_label": 'Choose a password:',
     "verified_password_label": 'Confirm your password:',
-    "hostname_extra_label": 'The name it uses when it talks to other computers.'
-}
\ No newline at end of file
+    "hostname_extra_label": 'The name it uses when it talks to other '
+    'computers.'
+}

=== modified file 'autopilot/ubiquity_autopilot_tests/configs/partconfig.py'
--- autopilot/ubiquity_autopilot_tests/configs/partconfig.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/configs/partconfig.py	2013-11-19 09:56:21 +0000
@@ -11,8 +11,9 @@
         'PartitionSize': int,  # an int value of size in MB If set to None,
                                  we use up all remaining space
 
+        # These are the current available mount points
         'MountPoint': /, /boot, /home,
-                      /tmp, /usr, /var,       # These are the current available mount points
+                      /tmp, /usr, /var,
                       /srv, /opt, /usr/local
 
         'FileSystemType': 'Ext2','Ext3', 'Ext4', 'ReiserFs',
@@ -280,4 +281,4 @@
         'PartitionType': 'Primary',
         'Position': 'Beginning'
     }
-]
\ No newline at end of file
+]

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkaccessible.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkaccessible.py	2013-11-12 19:27:27 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkaccessible.py	2013-11-19 09:56:21 +0000
@@ -55,7 +55,8 @@
         logger.debug('Selecting {0} item'.format(label))
         item = self._get_item(label)
         if item is None:
-            raise ValueError("Could not select item with label {0}".format(label))
+            raise ValueError("Could not select item with label {0}"
+                             .format(label))
         logger.debug('{0} item found, returning item'.format(label))
         return item
 
@@ -93,7 +94,8 @@
 
     def _get_item(self, label):
         """ Gets an item in a GtkTreeView """
-        return self.select_single('GtkTextCellAccessible', accessible_name=label)
+        return self.select_single('GtkTextCellAccessible',
+                                  accessible_name=label)
 
 
 class GtkNoteBookAccessible(AutopilotGtkEmulatorBase):

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py	2013-11-13 09:41:47 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkcontainers.py	2013-11-19 09:56:21 +0000
@@ -4,14 +4,14 @@
 #
 # Author: Daniel Chapman [e-mail]
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; version 3.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -55,18 +55,20 @@
             if language_item is None:
                 raise ValueError("Language could not be selected")
             return language_item
-        raise RuntimeError("Function can only be used from a stepLanguage \
-                            page object. Use .select_single('GtkBox, name='stepLanguage')")
+        raise RuntimeError("Function can only be used from a stepLanguage "
+                           "page object. Use .select_single('GtkBox, "
+                           "name='stepLanguage')")
 
     def select_language(self, item):
         """ Selects a language for the install
 
-        You can either use get_random_language or if you want to set the install
-        language instead of randomly selecting an item. Then select from the treeview
-        using GtkTreeView.select_item and pass the returned item to select_language
+        You can either use get_random_language or if you want to set the
+        install language instead of randomly selecting an item. Then select
+        from the treeview using GtkTreeView.select_item and pass the returned
+        item to select_language
 
         :param item: A treeview item object
-        :raises: exception if function not called from stepLanguage page object"
+        :raises: exception if function not called from stepLanguage page object
 
 
         """
@@ -81,7 +83,8 @@
             top_item = tree_items[0]
             #If we are at the top
             if top_item.selected:
-                logger.debug("top item {0} selected".format(top_item.accessible_name))
+                logger.debug("top item {0} selected"
+                             .format(top_item.accessible_name))
                 #Now select required Language
                 self.kbd.type(item.accessible_name[0:2])
                 item.click()
@@ -91,8 +94,9 @@
                     return
                 raise ValueError("Could not select Item")
             raise ValueError("Top item  not selected")
-        raise ValueError("Function can only be used from a stepLanguage \
-                                page object. Use .select_single('GtkBox, name='stepLanguage')")
+        raise ValueError("Function can only be used from a stepLanguage page "
+                         "object. Use .select_single('GtkBox, "
+                         "name='stepLanguage')")
 
     def _get_install_language(self, ):
         """ Gets a random language for the install
@@ -143,7 +147,7 @@
             pos = self.pointing_device.position()
             x = pos[0]
             y = pos[1]
-            x -= 25# px
+            x -= 25  # px
             self.pointing_device.move(x, y)
             while True:
                 entry = self.select_single('GtkEntry')
@@ -151,19 +155,22 @@
                     pos = self.pointing_device.position()
                     x = pos[0]
                     y = pos[1]
-                    y -= 10# px
+                    y -= 10  # px
                     self.pointing_device.move(x, y)
                     self.pointing_device.click()
                     if y < y1:
-                        logger.warning("We missed the location on the map and ended up outside the globalRect. \
-                        Now using the default selected location instead")
+                        logger.warning("We missed the location on the map and "
+                                       "ended up outside the globalRect. Now "
+                                       "using the default selected location "
+                                       "instead")
                         break
                 else:
                     expectThat(entry.text).equals(location)
                     logger.debug("Location; '{0}' selected".format(location))
                     break
         else:
-            raise ValueError("Function can only be called from a stepLocation page object")
+            raise ValueError("Function can only be called from a "
+                             "stepLocation page object")
 
     def create_user(self, name, password):
         """ Creates a user account with password
@@ -177,7 +184,8 @@
             self._enter_username(name)
             self._enter_password(password)
         else:
-            raise ValueError ("Function can only be called froma stepUserInfo page object")
+            raise ValueError("Function can only be called froma stepUserInfo"
+                             "page object")
 
     def _enter_username(self, name):
         """ Enters the username
@@ -194,30 +202,35 @@
         #lets get the fullname from the entry
         # as we don't know the kb layout till runtime
         fullname = entry.text
-        logger.debug("Checking that name, username and hostname all contain '{0}'".format(name))
+        logger.debug("Checking that name, username and hostname all contain "
+                     "'{0}'".format(name))
         #now check computer name contains username
         hostname_entry = self.select_single('GtkEntry', name='hostname')
         expectThat(hostname_entry.text).contains(
             fullname.lower(),
-            msg="GtkBox._enter_username(): Expected the hostname entry: '{0}', to contain '{1}'".format(
-                hostname_entry.text,
-                fullname.lower()))
+            msg="GtkBox._enter_username(): Expected the hostname entry: "
+                "'{0}', to contain '{1}'"
+                .format(hostname_entry.text, fullname.lower()))
         #check username contains name
         username_entry = self.select_single('GtkEntry', name='username')
         expectThat(username_entry.text).contains(
             fullname.lower(),
-            msg="GtkBox._enter_username(): Expected the username entry: '{0}', to contain '{1}'".format(
-                username_entry.text,
-                fullname.lower()))
+            msg="GtkBox._enter_username(): Expected the username entry: "
+                "'{0}', to contain '{1}'"
+                .format(username_entry.text, fullname.lower()))
         #check the GtkYes images are now visible
         logger.debug("Checking the stock 'gtk-yes' images are visible")
         images = ['fullname_ok', 'hostname_ok', 'username_ok']
         for image in images:
             img = self.select_single('GtkImage', name=image)
-            expectThat(img.visible).equals(True, msg="Expected {0} image to be visible but it wasn't".format(img.name))
-            expectThat(img.stock).equals('gtk-yes',
-                                         msg="Expected {0} image to have a 'gtk-yes' stock image and not {1}".format(
-                                             img.name, img.stock))
+            expectThat(img.visible).equals(
+                True,
+                msg="Expected {0} image to be visible but it wasn't"
+                .format(img.name))
+            expectThat(img.stock).equals(
+                'gtk-yes',
+                msg="Expected {0} image to have a 'gtk-yes' stock image and "
+                    "not {1}".format(img.name, img.stock))
 
     def _enter_password(self, password):
         if self.name == 'stepUserInfo':
@@ -229,9 +242,8 @@
                 if match:
                     break
         else:
-            raise ValueError(
-                "enter_crypto_phrase() can only be called from stepPartCrypto page object"
-            )
+            raise ValueError("enter_crypto_phrase() can only be called from "
+                             "stepPartCrypto page object")
 
     def _enter_pass_phrase(self, phrase):
 
@@ -241,7 +253,10 @@
             with self.kbd.focused_type(entry) as kb:
                 kb.press_and_release('Ctrl+a')
                 kb.press_and_release('Delete')
-                expectThat(entry.text).equals(u'', msg='{0} entry text was not cleared properly'.format(entry.name))
+                expectThat(entry.text).equals(
+                    u'',
+                    msg='{0} entry text was not cleared properly'
+                    .format(entry.name))
                 kb.type(phrase)
 
     def _check_phrase_match(self, ):
@@ -270,9 +285,8 @@
                 if match:
                     break
         else:
-            raise ValueError(
-                "enter_crypto_phrase() can only be called from stepPartCrypto page object"
-            )
+            raise ValueError("enter_crypto_phrase() can only be called from "
+                             "stepPartCrypto page object")
 
     def _enter_pass_phrase(self, phrase):
 
@@ -282,7 +296,10 @@
             with self.kbd.focused_type(entry) as kb:
                 kb.press_and_release('Ctrl+a')
                 kb.press_and_release('Delete')
-                expectThat(entry.text).equals(u'', msg='{0} entry text was not cleared properly'.format(entry.name))
+                expectThat(entry.text).equals(
+                    u'',
+                    msg='{0} entry text was not cleared properly'
+                        .format(entry.name))
                 kb.type(phrase)
 
     def _check_crypto_phrase_match(self, ):
@@ -295,13 +312,13 @@
 
     def create_new_partition_table(self, ):
         if self.name == 'stepPartAdvanced':
-            new_partition_button = self.select_single(BuilderName='partition_button_new_label')
+            new_partition_button = self.select_single(
+                BuilderName='partition_button_new_label')
             self.pointing_device.click_object(new_partition_button)
             time.sleep(5)
             self.kbd.press_and_release('Right')
             self.kbd.press_and_release('Enter')
             time.sleep(5)
         else:
-            raise ValueError(
-                "create_new_partition_table() can only be called from stepPartAdvanced page object"
-            )
+            raise ValueError("create_new_partition_table() can only be called "
+                             "from stepPartAdvanced page object")

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtkcontrols.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtkcontrols.py	2013-11-12 19:57:55 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtkcontrols.py	2013-11-19 09:56:21 +0000
@@ -44,9 +44,10 @@
     def click(self,):
         """ Clicks a GtkButton widget
 
-        On some occasions you may need to wait for a button to become sensitive.
-        So when calling this function if the sensitive property is 0 it will wait for 10 seconds
-        for button to become sensitive before clicking
+        On some occasions you may need to wait for a button to become
+        sensitive.
+        So when calling this function if the sensitive property is 0 it will
+        wait for 10 seconds for button to become sensitive before clicking
         """
         #sometimes we may need to wait for the button to become clickable
         # so lets wait for it if we do
@@ -69,9 +70,15 @@
 
     def check(self, visible=True):
         expectThat(self.label).is_unicode()
-        expectThat(self.label).not_equals(u'', msg="Expected {0} label to contain text, but its empty".format(self.name))
-        expectThat(self.visible).equals(visible,
-                                        msg="Expected {0} label to be visible, but its wasn't".format(self.name))
+        expectThat(self.label).not_equals(
+            u'',
+            msg="Expected {0} label to contain text, but its empty"
+                .format(self.name))
+        expectThat(self.visible).equals(
+            visible,
+            msg="Expected {0} label to be visible, but its wasn't"
+                .format(self.name))
+
 
 class GtkToggleButton(AutopilotGtkEmulatorBase):
     """ Emulator for a GtkToggleButton instance """
@@ -81,9 +88,14 @@
 
     def check(self, visible=True):
         expectThat(self.label).is_unicode()
-        expectThat(self.label).not_equals(u'', msg="Expected {0} label to contain text, but its empty".format(self.name))
-        expectThat(self.visible).equals(visible,
-                                        msg="Expected {0} label to be visible, but its wasn't".format(self.name))
+        expectThat(self.label).not_equals(
+            u'',
+            msg="Expected {0} label to contain text, but its empty"
+                .format(self.name))
+        expectThat(self.visible).equals(
+            visible,
+            msg="Expected {0} label to be visible, but its wasn't"
+                .format(self.name))
 
     def click(self, ):
         """ Clicks a GtkToggleButton,
@@ -96,9 +108,9 @@
         new_val = 0
         if self.active == 0:
             new_val = 1
-        logger.debug('Objects current state is "{0}", \
-                    the state after clicking should be "{1}"'.format(
-            self.active, new_val))
+        logger.debug('Objects current state is "{0}", '
+                     'the state after clicking should be "{1}"'
+                     .format(self.active, new_val))
         #now click it
         self.pointing_device.click_object(self)
         #now wait for state to change
@@ -134,14 +146,19 @@
         #now wait for state to change
         self.active.wait_for(1)
         logger.debug(
-            'Object clicked and and selected. Active state changed successfully')
+            'Object clicked and and selected. Active state changed '
+            'successfully')
 
     def check(self, visible=True):
         expectThat(self.label).is_unicode()
-        expectThat(self.label).not_equals(u'',
-                                          msg="Expected {0} label to contain text, but its empty".format(self.name))
-        expectThat(self.visible).equals(visible,
-                                        msg="Expected {0} label to be visible, but its wasn't".format(self.name))
+        expectThat(self.label).not_equals(
+            u'',
+            msg="Expected {0} label to contain text, but its empty"
+                .format(self.name))
+        expectThat(self.visible).equals(
+            visible,
+            msg="Expected {0} label to be visible, but its wasn't"
+                .format(self.name))
 
 
 class GtkImage(AutopilotGtkEmulatorBase):
@@ -151,13 +168,15 @@
 
     def check(self, visible=True, imageStock='gtk-yes'):
         if visible:
-            expectThat(self.visible).equals(visible,
-                                            msg="Expected {0} label to be visible, but its wasn't".format(self.name))
+            expectThat(self.visible).equals(
+                visible,
+                msg="Expected {0} label to be visible, but its wasn't"
+                    .format(self.name))
 
-            expectThat(self.stock).equals(imageStock,
-                                          msg="Expected {0} image to have stock image {1} but instead it is {2}".format(
-                                              self.name, imageStock, self.stock
-                                          ))
+            expectThat(self.stock).equals(
+                imageStock,
+                msg="Expected {0} image to have stock image {1} but instead "
+                    "it is {2}".format(self.name, imageStock, self.stock))
 
 
 class GtkTreeView(AutopilotGtkEmulatorBase):
@@ -189,16 +208,18 @@
         """
         logger.debug('Selecting "{0}" item'.format(labelText))
         try:
-            #lets try and get the corresponding GailTreeView
-            # so we can assure we are selecting the item from the correct treeview
+            # lets try and get the corresponding GailTreeView so we can assure
+            # we are selecting the item from the correct treeview
             treeview = self._get_gail_treeview()
             treeview_item = treeview.select_item(str(labelText))
         except ValueError:
-            #lets catch the exception and have one last go at selecting the item from a root instance
+            # lets catch the exception and have one last go at selecting the
+            # item from a root instance
             # This may return more than one though.
-            logger.warning('Could not get corresponding GtkTreeViewAccessibleObject \
-                           with globalRect {0}. Trying to select GtkTreeView item \
-                           from root object instead'.format(self.globalRect))
+            logger.warning('Could not get corresponding '
+                           'GtkTreeViewAccessibleObject with globalRect {0}. '
+                           'Trying to select GtkTreeView item  from root '
+                           'object instead'.format(self.globalRect))
             root = self.get_root_instance()
             if root is None:
                 raise ValueError("Emulator could not get a root instance")
@@ -221,7 +242,8 @@
         treeview = self._get_gail_treeview()
         treeview_item = treeview.select_item_by_index(index)
         if treeview_item is None:
-            raise ValueError("Could not select item with index '{0}'".format(index))
+            raise ValueError("Could not select item with index '{0}'"
+                             .format(index))
         return treeview_item
 
     def get_all_items(self, startWith=None):
@@ -233,13 +255,16 @@
         return items
 
     def _get_gail_treeview(self, ):
-        """ Gets the GtkTreeViews corresponding GtkTreeViewAccessible object """
+        """
+        Gets the GtkTreeViews corresponding GtkTreeViewAccessible object
+        """
         logger.debug('Getting corresponding GtkTreeViewAccessible object')
         # lets get a root instance
         root = self.get_root_instance()
         assert root is not None
-        # As the treeview item is in the GAILWindow tree and not our current tree
-        # We want to select the treeviewaccessible with the same globalRect as us
+        # As the treeview item is in the GAILWindow tree and not our current
+        # tree We want to select the treeviewaccessible with the same
+        # globalRect as us
         logger.debug('Selecting GtkTreeViewAccessible with same globalRect')
         treeviews = root.select_many('GtkTreeViewAccessible',
                                      globalRect=self.globalRect)
@@ -247,7 +272,8 @@
         # same globalRect so lets pick out the one thats visible
         for treeview in treeviews:
             if treeview.visible:
-                logger.debug('GtkTreeViewAccessible object found, returning object.')
+                logger.debug('GtkTreeViewAccessible object found, '
+                             'returning object.')
                 return treeview
         raise ValueError(
             "No treeview visible with globalRect {0}".format(self.globalRect)
@@ -317,7 +343,8 @@
         self.kbd.press_and_release('Home')
         self.kbd.press_and_release('Enter')
 
-        index = next((index for index, value in enumerate(items) if fsFormat == value.accessible_name), None)
+        index = next((index for index, value in enumerate(items)
+                      if fsFormat == value.accessible_name), None)
 
         i = 0
         while True:
@@ -348,7 +375,8 @@
 class GtkComboBoxText(GtkComboBox):
     """ Emulator class for a GtkComboBoxText instance
 
-    .. note:: see :func:`GtkComboBox`. `GtkComboBoxText` inherits from `GtkComboBox`
+    .. note:: see :func:`GtkComboBox`. `GtkComboBoxText` inherits from
+        `GtkComboBox`
 
     """
     def __init__(self, *args):
@@ -367,7 +395,10 @@
     def enter_value(self, value):
         self._select_entry()
         self.kbd.type(value)
-        expectThat(self.text).equals(value, msg="Expected spinbutton value '{0}' to equal {1}".format(self.text, value))
+        expectThat(self.text).equals(
+            value,
+            msg="Expected spinbutton value '{0}' to equal {1}"
+                .format(self.text, value))
 
     def _select_entry(self, ):
         self.pointing_device.move_to_object(self)

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/gtktoplevel.py'
--- autopilot/ubiquity_autopilot_tests/emulators/gtktoplevel.py	2013-11-12 19:27:27 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/gtktoplevel.py	2013-11-19 09:56:21 +0000
@@ -4,23 +4,27 @@
 #
 # Author: Daniel Chapman [e-mail]
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; version 3.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 from autopilot.input import Pointer, Mouse, Keyboard
-from ubiquity_autopilot_tests.emulators import AutopilotGtkEmulatorBase, EmulatorException
+from ubiquity_autopilot_tests.emulators\
+    import AutopilotGtkEmulatorBase, EmulatorException
 from ubiquity_autopilot_tests.tools.compare import expectThat
-from ubiquity_autopilot_tests.emulators.partconfig import Config1, Config2, Config3
-from ubiquity_autopilot_tests.emulators.partconfig import Config4, Config5, Config6
-from ubiquity_autopilot_tests.emulators import gtkcontrols, gtkaccessible, gtkcontainers
+from ubiquity_autopilot_tests.emulators.partconfig\
+    import Config1, Config2, Config3
+from ubiquity_autopilot_tests.emulators.partconfig\
+    import Config4, Config5, Config6
+from ubiquity_autopilot_tests.emulators\
+    import gtkcontrols, gtkaccessible, gtkcontainers
 import time
 import logging
 logger = logging.getLogger(__name__)
@@ -31,8 +35,8 @@
 class GtkWindow(AutopilotGtkEmulatorBase):
     """ Emulator class for a GtkWindow instance
 
-        You should use this class for the main window of the application under test.
-        By importing this into your test and select it as a property::
+        You should use this class for the main window of the application under
+        test.  By importing this into your test and select it as a property::
 
             from autopilotgtkemulators import gtktoplevel
 
@@ -46,17 +50,21 @@
                 def main_window(self, ):
                     return self.app.select_single(gtktoplevel.GtkWindow)
 
-        and now you can use self.main_window as our base for accessing all the objects within
-        the Main application window.
-
-        .. note:: When dealing with dialogs/windows spawned from the main application window
-                  use the :func:`get_dialog` to get an object of the spawned dialog/window ::
-
-                      >>> spawned_object = self.main_window.get_dialog('GtkDialog')
-
-                  and you can use keyword arguments if it returns more than one::
-
-                      >>> spawned_object = self.main_window.get_dialog('GtkDialog', name='foo')
+        and now you can use self.main_window as our base for accessing all the
+        objects within the Main application window.
+
+        .. note:: When dealing with dialogs/windows spawned from the main
+                  application window use the :func:`get_dialog` to get an
+                  object of the spawned dialog/window ::
+
+                      >>> spawned_object = self.main_window.get_dialog(\
+                              'GtkDialog')
+
+                  and you can use keyword arguments if it returns more than
+                  one::
+
+                      >>> spawned_object = self.main_window.get_dialog(\
+                              'GtkDialog', name='foo')
     """
     def __init__(self, *args):
 
@@ -69,7 +77,8 @@
 
                 :param dialogType: Window type of the dialog e.g 'GtkDialog'
                 :rtype: a dialog object of the given dialogType
-                :raises: **EmulatorException** if a root instance cannot be obtained
+                :raises: **EmulatorException** if a root instance cannot be
+                         obtained
                 :raises: **ValueError** if the returned object is NoneType
         """
         logger.debug('Getting root instance')
@@ -77,11 +86,13 @@
         if root is None:
             raise EmulatorException("Emulator could not get root instance")
         logger.debug(
-            'Root instance received, Now selecting "{0}" object'.format(dialogType))
+            'Root instance received, Now selecting "{0}" object'
+            .format(dialogType))
         dialog = root.select_single(dialogType, **kwargs)
         if dialog is None:
             raise ValueError(
-                "Returned NoneType, could not select object of type {0}".format(dialogType))
+                "Returned NoneType, could not select object of type {0}"
+                .format(dialogType))
         logger.debug('Returning {0} object'.format(dialogType))
         return dialog
 
@@ -125,28 +136,35 @@
         while progress < complete:
             #keep updating fraction value
             progress = self.install_progress.fraction
-            # lets sleep for a second on each loop until we get near the end of the progress bar
+            # lets sleep for a second on each loop until we get near the end of
+            # the progress bar
             if progress < 0.7:
                 time.sleep(1)
 
-            logger.debug('Percentage complete "{0:.0f}%"'.format(progress * 100))
+            logger.debug('Percentage complete "{0:.0f}%"'
+                         .format(progress * 100))
             #check for install errors while waiting
             try:
-                crash_dialog = self.get_dialog('GtkDialog', BuilderName='crash_dialog')
+                crash_dialog = self.get_dialog('GtkDialog',
+                                               BuilderName='crash_dialog')
                 logger.debug("Checking crash dialog hasn't appeared....")
                 if crash_dialog.visibe:
                     logger.error("Crash Dialog appeared")
-                    assert not crash_dialog.visible, "Crash Dialog appeared! Something went wrong!!!"
+                    assert not crash_dialog.visible,\
+                        "Crash Dialog appeared! Something went wrong!!!"
                     progress = 1.0
             except Exception:
                 pass
             # Lets try and grab the grub failed message box on the fly
             try:
-                logger.debug("Checking failed grub install dialog hasn't appeared.......")
+                logger.debug("Checking failed grub install dialog hasn't "
+                             "appeared.......")
                 grub_dialog = self.get_dialog('GtkMessageDialog')
                 if grub_dialog.visible:
-                    logger.error("The Grub installation failed dialog appeared :-(")
-                    assert grub_dialog.visible != 1, "The Grub installation failed"
+                    logger.error("The Grub installation failed dialog "
+                                 "appeared :-(")
+                    assert grub_dialog.visible != 1,\
+                        "The Grub installation failed"
                     progress = 1.0
             except Exception:
                 pass
@@ -162,7 +180,8 @@
     def set_partition_size(self, size=None):
         """ Sets the size of the partition being created
 
-        :param size: Partition size in MB, if None will use rest of remaining space
+        :param size: Partition size in MB, if None will use rest of remaining
+                     space
         """
         logger.debug("set_partition_size({0})".format(str(size)))
         if size:
@@ -197,7 +216,8 @@
         _partition_type = {'Primary': 'partition_create_type_primary',
                            'Logical': 'partition_create_type_logical'}
         part_type = _partition_type[pType]
-        radiobutton = self.select_single('GtkRadioButton', BuilderName=part_type)
+        radiobutton = self.select_single('GtkRadioButton',
+                                         BuilderName=part_type)
         radiobutton.click()
 
     def set_file_system_type(self, fsType):
@@ -222,27 +242,35 @@
                              'Nothing': 'do not use partition'
                              }
         file_system = _file_system_type[fsType]
-        combobox = self.select_single('GtkComboBox', BuilderName='partition_use_combo')
+        combobox = self.select_single('GtkComboBox',
+                                      BuilderName='partition_use_combo')
         combobox.select_filesystem_format(file_system)
 
     def set_mount_point(self, mntPoint=None):
         """ Sets the mount point for the partition """
         logger.debug("set_mount_point({0})".format(mntPoint))
         if mntPoint:
-            combobox = self.select_single('GtkComboBox', BuilderName='partition_mount_combo')
+            combobox = self.select_single('GtkComboBox',
+                                          BuilderName='partition_mount_combo')
             combobox.select_item(mntPoint, enter=False)
 
         return
 
     def check_dialog_objects(self, ):
-        objects = ['partition_mount_combo', 'partition_use_combo',
-                   'partition_create_type_primary', 'partition_create_type_logical',
-                   'partition_create_place_beginning', 'partition_create_place_end',
+        objects = ['partition_mount_combo',
+                   'partition_use_combo',
+                   'partition_create_type_primary',
+                   'partition_create_type_logical',
+                   'partition_create_place_beginning',
+                   'partition_create_place_end',
                    ]
         for name in objects:
             obj = self.select_single(BuilderName=name)
             obj.check()
-        expectThat(self.visible).equals(True, msg='Partition Dialog was not visible')
+        expectThat(self.visible).equals(
+            True,
+            msg='Partition Dialog was not visible')
+
 
 class GtkMessageDialog(GtkDialog):
     """ Emulator class for a GtkMessageDialog, """

=== modified file 'autopilot/ubiquity_autopilot_tests/emulators/partconfig.py'
--- autopilot/ubiquity_autopilot_tests/emulators/partconfig.py	2013-10-22 16:51:31 +0000
+++ autopilot/ubiquity_autopilot_tests/emulators/partconfig.py	2013-11-19 09:56:21 +0000
@@ -11,8 +11,9 @@
         'PartitionSize': int,  # an int value of size in MB If set to None,
                                  we use up all remaining space
 
+        # These are the current available mount points
         'MountPoint': /, /boot, /home,
-                      /tmp, /usr, /var,       # These are the current available mount points
+                      /tmp, /usr, /var,
                       /srv, /opt, /usr/local
 
         'FileSystemType': 'Ext2','Ext3', 'Ext4', 'ReiserFs',

=== modified file 'autopilot/ubiquity_autopilot_tests/testcase.py'
--- autopilot/ubiquity_autopilot_tests/testcase.py	2013-11-12 19:35:59 +0000
+++ autopilot/ubiquity_autopilot_tests/testcase.py	2013-11-19 09:56:21 +0000
@@ -62,9 +62,11 @@
 %s
 _______________________________________________________________________
 """ % error
-                self.addDetail("Non-Fatal error {0}: ".format(num), text_content(output))
+                self.addDetail("Non-Fatal error {0}: ".format(num),
+                               text_content(output))
                 num += 1
-            raise NonFatalErrors("{0} non fatal errors found during install".format(len(error_list)))
+            raise NonFatalErrors("{0} non fatal errors found during install"
+                                 .format(len(error_list)))
         return
 
     def expectEqual(self, expected, observed, message=''):
@@ -78,7 +80,8 @@
         try:
             self._expectThat(observed, matcher, message)
         except MismatchError:
-            logger.error("Expected %r to equal %r but it didn't" % expected, observed, exc_info=True)
+            logger.error("Expected %r to equal %r but it didn't" %
+                         expected, observed, exc_info=True)
             stck = traceback.format_exc(limit=5)
             self.non_fatal_errors.append(stck)
 
@@ -103,7 +106,8 @@
         try:
             self._expectThat(obj, matcher, msg)
         except MismatchError:
-            logger.error("Expected %r to be instance of %r but it wasn't" % obj, klass, exc_info=True)
+            logger.error("Expected %r to be instance of %r but it wasn't" %
+                         obj, klass, exc_info=True)
             stck = traceback.format_exc(limit=5)
             self.non_fatal_errors.append(stck)
 

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/__init__.py'
--- autopilot/ubiquity_autopilot_tests/tests/__init__.py	2013-11-15 17:15:32 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/__init__.py	2013-11-19 09:56:21 +0000
@@ -71,9 +71,9 @@
         '''
         my_process = int(os.environ['UBIQUITY_PID'])
         my_dbus = str(os.environ['DBUS_SESSION_BUS_ADDRESS'])
-        return get_proxy_object_for_existing_process(pid=my_process,
-                                                     dbus_bus=my_dbus,
-                                                     emulator_base=AutopilotGtkEmulatorBase)
+        return get_proxy_object_for_existing_process(
+            pid=my_process, dbus_bus=my_dbus,
+            emulator_base=AutopilotGtkEmulatorBase)
 
     @property
     def main_window(self, ):
@@ -96,15 +96,19 @@
         nxt_button.click()
 
         if wait:
-            #This sleep just bridges a weird error when the next button, sometimes
-            # flickers its sensitive property back to 1 once clicked and then
-            # goes back to 0
+            # This sleep just bridges a weird error when the next button,
+            # sometimes flickers its sensitive property back to 1 once clicked
+            # and then goes back to 0
             time.sleep(2)
-            # now take back over from the sleep and wait for sensitive to become 1
-            logger.debug("Waiting for 'next' Button to become sensitive again.....")
-            self.assertThat(nxt_button.sensitive, Eventually(Equals(True), timeout=1200))
+            # now take back over from the sleep and wait for sensitive to
+            # become 1
+            logger.debug("Waiting for 'next' Button to become sensitive "
+                         "again.....")
+            self.assertThat(nxt_button.sensitive,
+                            Eventually(Equals(True), timeout=1200))
 
-        page_title = self.main_window.select_single('GtkLabel', name='page_title')
+        page_title = self.main_window.select_single(
+            'GtkLabel', name='page_title')
         self.assertThat(page_title.label,
                         Eventually(NotEquals(self.current_page_title),
                                    timeout=120))
@@ -112,19 +116,23 @@
     def go_to_progress_page(self, ):
         """ This simply clicks next and goes to the progress page
 
-        NOTE: THis shouldn't be used for any other page switches as it does no checks.
-        
+        NOTE:
+            This shouldn't be used for any other page switches as it does no
+            checks.
+
         """
         nxt_button = self.main_window.select_single('GtkButton', name='next')
         nxt_button.click()
 
     def welcome_page_tests(self, lang=None):
         """ Runs the tests for the Welcome Page
-        :param lang: The treeview label value (e.g 'English') of the required language.
+        :param lang: The treeview label value (e.g 'English') of the required
+                     language.
                      If None will pick a random language from the tree.
-                     ..NOTE: You should only specify a language if the test relies
-                           upon a specific language. It is better to write the tests
-                           to work for any language.
+                     ..NOTE: You should only specify a language if the test
+                         relies upon a specific language. It is better to write
+                         the tests to work for any language.
+
         """
         self._update_current_step('stepLanguage')
         self._check_navigation_buttons()
@@ -132,19 +140,23 @@
         logger.debug("run_welcome_page_tests()")
         #selecting an install language
         logger.debug("Selecting stepLanguage page object")
-        welcome_page = self.main_window.select_single('GtkBox', name='stepLanguage')
+        welcome_page = self.main_window.select_single(
+            'GtkBox', name='stepLanguage')
         treeview = welcome_page.select_single('GtkTreeView')
         #lets get all items
         treeview_items = treeview.get_all_items()
         #first lets check all the items are non-empty unicode strings
         logger.debug("Checking all tree items are valid unicode")
         for item in treeview_items:
-            logger.debug("Check tree item with name '%s' is unicode" % item.accessible_name)
+            logger.debug("Check tree item with name '%s' is unicode" %
+                         item.accessible_name)
             self.expectIsInstance(item.accessible_name, str,
-                                  "[Page:'stepLanguage'] Expected '%s' tree view item to be unicode but it wasn't"
-                                  % item.accessible_name)
+                                  "[Page:'stepLanguage'] Expected '%s' tree "
+                                  "view item to be unicode but it wasn't" %
+                                  item.accessible_name)
             self.expectThat(item.accessible_name, NotEquals(u''),
-                            "[Page:'stepLanguage'] Tree item found that doesn't contain any text")
+                            "[Page:'stepLanguage'] Tree item found that "
+                            "doesn't contain any text")
 
         if lang:
             item = treeview.select_item(lang)
@@ -158,21 +170,26 @@
         self.assertThat(language.selected, Equals(True))
         ##Test release notes label is visible
         logger.debug("Checking the release_notes_label")
-        release_notes_label = welcome_page.select_single('GtkLabel',
-                                                         BuilderName='release_notes_label')
+        release_notes_label = welcome_page.select_single(
+            'GtkLabel', BuilderName='release_notes_label')
         self.expectThat(release_notes_label.visible, Equals(True),
-                        "[Page:'{0}'] Release notes label was not visible".format(self.current_step))
+                        "[Page:'{0}'] Release notes label was not visible"
+                        .format(self.current_step))
         self.expectThat(release_notes_label.label, NotEquals(u''),
-                        "[Page:'{0}'] Release notes label did not contain any text".format(self.current_step))
+                        "[Page:'{0}'] Release notes label did not contain "
+                        "any text".format(self.current_step))
         self.expectIsInstance(release_notes_label.label, str,
-                              "[Page:'{0}'] Expected release notes label to be unicode but it wasn't")
+                              "[Page:'{0}'] Expected release notes label to "
+                              "be unicode but it wasn't")
         self.pointing_device.move_to_object(release_notes_label)
         self._update_page_titles()
         if self.english_install:
             #if english install check english values
             self.eng_config = eng_label_values.stepLanguage
-            self.expectThat(release_notes_label.label, Equals(self.eng_config['release_notes_label']))
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(release_notes_label.label,
+                            Equals(self.eng_config['release_notes_label']))
+            self.expectThat(self.current_page_title,
+                            Equals(self.eng_config['page_title']))
         self._check_page_titles()
         self._check_navigation_buttons()
 
@@ -183,22 +200,24 @@
 
         :param updates: Boolean, if True selects install updates during install
 
-        :param thirdParty: Boolean, if True selects install third-party software
+        :param thirdParty: Boolean, if True selects install third-party
+                                    software
 
-        :param networkConnection: Boolean if True checks the network state box is
-                                  visible and objects are correct, If false will
-                                  still check the objects are correct but the
-                                  state box is not visible
+        :param networkConnection: Boolean if True checks the network state box
+                                    is visible and objects are correct, If
+                                    false will still check the objects are
+                                    correct but the state box is not visible
 
         :param sufficientSpace: Boolean if True checks the network state box is
-                                  visible and objects are correct, If false will
-                                  still check the objects are correct but the
-                                  state box is not visible
+                                    visible and objects are correct, If false
+                                    will still check the objects are correct
+                                    but the state box is not visible
 
         :param powerSource: Boolean if True checks the network state box is
-                                  visible and objects are correct, If false will
-                                  still check the objects are correct but the
-                                  state box is not visible
+                                    visible and objects are correct, If false
+                                    will still check the objects are correct
+                                    but the state box is not visible
+
         """
         self._update_current_step('stepPrepare')
         self._check_navigation_buttons()
@@ -206,7 +225,8 @@
 
         logger.debug("run_preparing_page_tests()")
         logger.debug("selecting stepPrepare page")
-        preparing_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPrepare')
+        preparing_page = self.main_window.select_single(
+            'GtkAlignment', BuilderName='stepPrepare')
 
         objList = ['prepare_best_results', 'prepare_foss_disclaimer',
                    'prepare_download_updates', 'prepare_nonfree_software']
@@ -214,33 +234,32 @@
             logging.debug("Running checks on {0} object".format(i))
             obj = preparing_page.select_single(BuilderName=i)
             self.expectThat(obj.visible, Equals(True),
-                            "[Page:'{0}'] Expected {1} object to be visible but it wasn't".format(
-                                self.current_step, obj.name
-                            ))
+                            "[Page:'{0}'] Expected {1} object to be "
+                            "visible but it wasn't"
+                            .format(self.current_step, obj.name))
             self.expectThat(obj.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                                self.current_step, obj.name
-                            ))
+                            "[Page:'{0}'] Expected {1} objects label value "
+                            "to contain text but it didn't"
+                            .format(self.current_step, obj.name))
             self.expectIsInstance(obj.label, str,
-                                  "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, obj.name
-                                  ))
+                                  "[Page:'{0}'] Expected {1} objects label "
+                                  "value to be unicode but it wasn't"
+                                  .format(self.current_step, obj.name))
             if self.english_install:
                 #if english install check english values
                 self.eng_config = eng_label_values.stepPrepare
                 self.expectThat(obj.label, Equals(self.eng_config[i]))
 
-
         if updates:
             logger.debug("Selecting install updates")
-            update_checkbutton = preparing_page.select_single('GtkCheckButton',
-                                                              BuilderName='prepare_download_updates')
+            update_checkbutton = preparing_page.select_single(
+                'GtkCheckButton', BuilderName='prepare_download_updates')
             self.pointing_device.click_object(update_checkbutton)
 
         if thirdParty:
             logger.debug("Selecting install thirdparty software")
-            thrdprty_checkbutton = preparing_page.select_single('GtkCheckButton',
-                                                                BuilderName='prepare_nonfree_software')
+            thrdprty_checkbutton = preparing_page.select_single(
+                'GtkCheckButton', BuilderName='prepare_nonfree_software')
             self.pointing_device.click_object(thrdprty_checkbutton)
 
         self._check_preparing_statebox('prepare_network_connection',
@@ -254,7 +273,8 @@
 
         self._check_page_titles()
         if self.english_install:
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(self.current_page_title,
+                            Equals(self.eng_config['page_title']))
         self._check_navigation_buttons()
 
     def edubuntu_addon_window_tests(self, ):
@@ -264,24 +284,26 @@
         self._update_current_step('edubuntu-addon_window')
         self._check_navigation_buttons()
         self._update_page_titles()
-        add_on_page = self.main_window.select_single('GtkVBox', BuilderName='edubuntu-addon_window')
-        page_objects = ['fallback_install', 'description', 'fallback_title', 'fallback_description',
-                        'ltsp_install', 'ltsp_title', 'ltsp_description', 'ltsp_interface_label']
+        add_on_page = self.main_window.select_single(
+            'GtkVBox', BuilderName='edubuntu-addon_window')
+        page_objects = ['fallback_install', 'description', 'fallback_title',
+                        'fallback_description', 'ltsp_install', 'ltsp_title',
+                        'ltsp_description', 'ltsp_interface_label']
 
         for i in page_objects:
             obj = add_on_page.select_single(BuilderName=i)
             self.expectThat(obj.visible, Equals(True),
-                            "[Page:'{0}'] Expected {1} object to be visible but it wasn't".format(
-                                self.current_step, obj.name
-                            ))
+                            "[Page:'{0}'] Expected {1} object to be visible "
+                            "but it wasn't"
+                            .format(self.current_step, obj.name))
             self.expectThat(obj.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                                self.current_step, obj.name
-                            ))
+                            "[Page:'{0}'] Expected {1} objects label value "
+                            "to contain text but it didn't"
+                            .format(self.current_step, obj.name))
             self.expectIsInstance(obj.label, str,
-                                  "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, obj.name
-                                  ))
+                                  "[Page:'{0}'] Expected {1} objects label "
+                                  "value to be unicode but it wasn't"
+                                  .format(self.current_step, obj.name))
             #if self.english_install:
             #    #if english install check english values
             #    self.eng_config = eng_label_values.stepPrepare
@@ -289,7 +311,8 @@
             #TODO: provide option to select different desktop
         self._check_page_titles()
         #if self.english_install:
-        #    self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+        #    self.expectThat(self.current_page_title,
+        #                    Equals(self.eng_config['page_title']))
         self._check_navigation_buttons()
 
     def edubuntu_packages_window_tests(self, ):
@@ -299,20 +322,22 @@
         self._update_current_step('edubuntu-packages_window')
         self._check_navigation_buttons()
         self._update_page_titles()
-        packages_page = self.main_window.select_single('GtkVBox', BuilderName='edubuntu-packages_window')
-        description = packages_page.select_single('GtkLabel', BuilderName='description')
+        packages_page = self.main_window.select_single(
+            'GtkVBox', BuilderName='edubuntu-packages_window')
+        description = packages_page.select_single(
+            'GtkLabel', BuilderName='description')
         self.expectThat(description.visible, Equals(True),
-                        "[Page:'{0}'] Expected {1} object to be visible but it wasn't".format(
-                            self.current_step, description.name
-                        ))
+                        "[Page:'{0}'] Expected {1} object to be visible but "
+                        "it wasn't"
+                        .format(self.current_step, description.name))
         self.expectThat(description.label, NotEquals(u''),
-                        "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                            self.current_step, description.name
-                        ))
+                        "[Page:'{0}'] Expected {1} objects label value to "
+                        "contain text but it didn't"
+                        .format(self.current_step, description.name))
         self.expectIsInstance(description.label, str,
-                              "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, description.name
-                              ))
+                              "[Page:'{0}'] Expected {1} objects label "
+                              "value to be unicode but it wasn't"
+                              .format(self.current_step, description.name))
         #if self.english_install:
             #    #if english install check english values
             #    self.eng_config = eng_label_values.stepPrepare
@@ -321,23 +346,26 @@
 
         self._check_page_titles()
         #if self.english_install:
-        #    self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+        #    self.expectThat(self.current_page_title,
+        #                    Equals(self.eng_config['page_title']))
         self._check_navigation_buttons()
 
-    def installation_type_page_tests(self, default=False, lvm=False, lvmEncrypt=False, custom=False):
-        """ Runs the tests for the installation type page
+    def installation_type_page_tests(self, default=False, lvm=False,
+                                     lvmEncrypt=False, custom=False):
+        """
+        Runs the tests for the installation type page
 
-        :param default: Boolean if True will use the default selected option for the
-                        installation
+        :param default: Boolean if True will use the default selected option
+            for the installation
 
         :param lvm: Boolean if True will use the LVM option for the
-                    installation
-
-        :param lvmEncrypt: Boolean if True will use the LVM with encryption option for the
-                           installation
-
-        :param custom: Boolean if True will use the 'Something else' option for the
-                       installation
+            installation
+
+        :param lvmEncrypt: Boolean if True will use the LVM with encryption
+            option for the installation
+
+        :param custom: Boolean if True will use the 'Something else' option for
+            the installation
 
         """
         self._update_current_step('stepPartAsk')
@@ -365,30 +393,35 @@
             config = custom_install
             option_name = 'custom_partitioning'
         self._options_tests(config.visible_options, config.hidden_options)
-        install_type_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPartAsk')
+        install_type_page = self.main_window.select_single(
+            'GtkAlignment', BuilderName='stepPartAsk')
         if option_name:
             obj = install_type_page.select_single(BuilderName=option_name)
             self.pointing_device.click_object(obj)
 
         self._check_page_titles()
         if self.english_install:
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(self.current_page_title,
+                            Equals(self.eng_config['page_title']))
 
         self._check_navigation_buttons()
 
     def lvm_crypto_page_tests(self, crypto_password):
         """ Runs the tests for the LVM encryption password page
 
-        :param crypto_password: *String*, password to be used for the encryption
+        :param crypto_password: *String*, password to be used for the
+                                encryption
 
         """
         self._update_current_step('stepPartCrypto')
         self._check_navigation_buttons()
         self._update_page_titles()
 
-        logger.debug("run_step_part_crypto_page_tests({0})".format(crypto_password))
+        logger.debug("run_step_part_crypto_page_tests({0})"
+                     .format(crypto_password))
         logger.debug('Selecting stepPartCrypto page object')
-        crypto_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPartCrypto')
+        crypto_page = self.main_window.select_single(
+            'GtkAlignment', BuilderName='stepPartCrypto')
 
         items = ['verified_crypto_label', 'crypto_label', 'crypto_description',
                  'crypto_warning', 'crypto_extra_label', 'crypto_extra_time',
@@ -396,17 +429,17 @@
         for i in items:
             item = crypto_page.select_single(BuilderName=i)
             self.expectThat(item.visible, Equals(True),
-                            "[Page:'{0}'] Expected {1} object to be visible but it wasn't".format(
-                                self.current_step, item.name
-                            ))
+                            "[Page:'{0}'] Expected {1} object to be visible "
+                            "but it wasn't"
+                            .format(self.current_step, item.name))
             self.expectThat(item.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                                self.current_step, item.name
-                            ))
+                            "[Page:'{0}'] Expected {1} objects label value "
+                            "to contain text but it didn't"
+                            .format(self.current_step, item.name))
             self.expectIsInstance(item.label, str,
-                                  "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, item.name
-                                  ))
+                                  "[Page:'{0}'] Expected {1} objects label "
+                                  "value to be unicode but it wasn't"
+                                  .format(self.current_step, item.name))
             if self.english_install:
                 #if english install check english values
                 self.eng_config = eng_label_values.stepPartCrypto
@@ -415,7 +448,8 @@
         crypto_page.enter_crypto_phrase(crypto_password)
         self._check_page_titles()
         if self.english_install:
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(self.current_page_title,
+                            Equals(self.eng_config['page_title']))
 
         self._check_navigation_buttons()
 
@@ -425,7 +459,8 @@
         The custom partition configurations are in partconfig.py. This function
         selects a random Config for each test run from partconfig.py.
 
-        When adding a new config, import it and add it to the custom_configs list
+        When adding a new config, import it and add it to the custom_configs
+        list
 
         :param part_config:
         """
@@ -434,17 +469,21 @@
         self._update_page_titles()
         logger.debug("run_custom_partition_page_tests()")
         logger.debug("Selecting the stepPartAdvanced page object")
-        custom_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPartAdvanced')
+        custom_page = self.main_window.select_single(
+            'GtkAlignment', BuilderName='stepPartAdvanced')
         treeview = custom_page.select_single('GtkTreeView')
         self.expectThat(treeview.visible, Equals(True),
                         "[Page:'{0}'] Partition tree view was not visible")
-        obj_list = ['partition_button_new', 'partition_button_delete', 'partition_button_edit',
-                    'partition_button_edit', 'partition_button_new_label']
+        obj_list = ['partition_button_new', 'partition_button_delete',
+                    'partition_button_edit', 'partition_button_edit',
+                    'partition_button_new_label']
         for name in obj_list:
             obj = custom_page.select_single(BuilderName=name)
             self.expectThat(obj.visible, Equals(True),
-                            "[Page:'{0}'] {1} object was not visible".format(self.current_step, obj.name))
-        logger.debug("Sleeping while we wait for all UI elements to fully load")
+                            "[Page:'{0}'] {1} object was not visible"
+                            .format(self.current_step, obj.name))
+        logger.debug("Sleeping while we wait for all UI elements to fully "
+                     "load")
         time.sleep(5)  # need to give time for all UI elements to load
         custom_page.create_new_partition_table()
         #lets create the partitions from here
@@ -457,7 +496,8 @@
         for elem in config:
             self._add_new_partition()
 
-            partition_dialog = self.main_window.get_dialog('GtkDialog', BuilderName='partition_dialog')
+            partition_dialog = self.main_window.get_dialog(
+                'GtkDialog', BuilderName='partition_dialog')
             self.assertThat(partition_dialog.visible, Eventually(Equals(True)),
                             "Partition dialog not visible")
             partition_dialog.set_partition_size(elem['PartitionSize'])
@@ -465,10 +505,11 @@
             partition_dialog.set_partition_type(elem['PartitionType'])
             partition_dialog.set_file_system_type(elem['FileSystemType'])
             partition_dialog.set_mount_point(elem['MountPoint'])
-            ok_button = partition_dialog.select_single('GtkButton',
-                                                       BuilderName='partition_dialog_okbutton')
+            ok_button = partition_dialog.select_single(
+                'GtkButton', BuilderName='partition_dialog_okbutton')
             self.pointing_device.click_object(ok_button)
-            self.assertThat(partition_dialog.visible, Eventually(Equals(False)),
+            self.assertThat(partition_dialog.visible,
+                            Eventually(Equals(False)),
                             "Partition dialog did not close")
             self._check_partition_created(elem['MountPoint'])
         self._check_page_titles()
@@ -488,11 +529,13 @@
         self._update_page_titles()
 
         logger.debug("Selecting stepLocation page object")
-        location_page = self.main_window.select_single('GtkBox', BuilderName='stepLocation')
+        location_page = self.main_window.select_single(
+            'GtkBox', BuilderName='stepLocation')
         location_map = location_page.select_single('CcTimezoneMap')
         self.assertThat(location_map.visible, Equals(True),
                         "Expected location map to be visible but it wasn't")
-        location_entry = location_page.select_single(BuilderName='timezone_city_entry')
+        location_entry = location_page.select_single(
+            BuilderName='timezone_city_entry')
         self.assertThat(location_entry.visible, Equals(True),
                         "Expected location entry to be visible but it wasn't")
 
@@ -501,7 +544,8 @@
         self._check_page_titles()
         if self.english_install:
             self.eng_config = eng_label_values.stepLocation
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(self.current_page_title,
+                            Equals(self.eng_config['page_title']))
 
         self._check_navigation_buttons(continue_button=True, back_button=True,
                                        quit_button=False, skip_button=False)
@@ -514,43 +558,50 @@
         logger.debug("run_keyboard_layout_page_tests()")
 
         logger.debug("Selecting the stepKeyboardCOnf page object")
-        keyboard_page = self.main_window.select_single('GtkAlignment', BuilderName='stepKeyboardConf')
+        keyboard_page = self.main_window.select_single(
+            'GtkAlignment',
+            BuilderName='stepKeyboardConf')
         treeviews = keyboard_page.select_many('GtkTreeView')
-        #lets check all the keyboard tree items for the selected language
+        # lets check all the keyboard tree items for the selected language
         # TODO: we should probably test at some point try changing the keyboard
-        #       layout to a different language/locale/layout and see if ubiquity breaks
+        #       layout to a different language/locale/layout and see if
+        #       ubiquity breaks
         for treeview in treeviews:
             items = treeview.get_all_items()
             for item in items:
                 self.expectIsInstance(item.accessible_name, str,
-                                      "[Page:'%r'] Expected %r item to be unicode but it wasn't" % (
-                                          self.current_step, item.accessible_name
-                                      ))
+                                      "[Page:'%r'] Expected %r item to be "
+                                      "unicode but it wasn't" % (
+                                          self.current_step,
+                                          item.accessible_name))
                 self.expectThat(item.accessible_name, NotEquals(u''),
-                                "[Page:'{0}'] Tree view item found which didn't contain text, but it should!!")
+                                "[Page:'{0}'] Tree view item found which "
+                                "didn't contain text, but it should!!")
 
-        #now lets test typing with the keyboard layout
+        # now lets test typing with the keyboard layout
         entry = keyboard_page.select_single('GtkEntry')
         with self.keyboard.focused_type(entry) as kb:
             kb.type(u'Testing keyboard layout')
-            #TODO: only test the entry value if we are using english install
-            #message = "Expected {0} (the length of the keyboard entry text) to be {1}".format(
-            #    len(entry.text), len(u'Testing keyboard layout')
-            #)
-            #self.expectThat(len(entry.text), Equals(len(u'Testing keyboard layout')))
+            # TODO: only test the entry value if we are using english install
+            #message = "Expected {0} (the length of the keyboard entry text) "
+            #     " to be {1}"
+            #     .format(len(entry.text), len(u'Testing keyboard layout'))
+            #self.expectThat(len(entry.text), Equals(
+            #   len(u'Testing keyboard layout')))
             self.expectThat(entry.text, NotEquals(u''),
-                            "[Page:'{0}'] Expected Entry to contain text after typing but it didn't".format(
-                                self.current_step
-                            ))
+                            "[Page:'{0}'] Expected Entry to contain text "
+                            "after typing but it didn't"
+                            .format(self.current_step))
             self.expectIsInstance(entry.text, str,
-                                  "[Page:'{0}'] Expected Entry text to be unicode but it wasnt".format(
-                                      self.current_step
-                                  ))
-        #TODO: Test detecting keyboard layout
+                                  "[Page:'{0}'] Expected Entry text to be "
+                                  "unicode but it wasnt"
+                                  .format(self.current_step))
+        # TODO: Test detecting keyboard layout
         self._check_page_titles()
         if self.english_install:
             self.eng_config = eng_label_values.stepKeyboardConf
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(self.current_page_title, Equals(
+                self.eng_config['page_title']))
 
         self._check_navigation_buttons(continue_button=True, back_button=True,
                                        quit_button=False, skip_button=False)
@@ -574,7 +625,9 @@
                                        quit_button=False, skip_button=False)
         self._update_page_titles()
         logger.debug("Selecting stepUserInfo page")
-        user_info_page = self.main_window.select_single('GtkBox', BuilderName='stepUserInfo')
+        user_info_page = self.main_window.select_single(
+            'GtkBox',
+            BuilderName='stepUserInfo')
 
         objects = ['hostname_label', 'username_label', 'password_label',
                    'verified_password_label', 'hostname_extra_label'
@@ -583,17 +636,17 @@
         for i in objects:
             obj = user_info_page.select_single('GtkLabel', name=i)
             self.expectThat(obj.visible, Equals(True),
-                            "[Page:'{0}'] Expected {1} object to be visible but it wasn't".format(
-                                self.current_step, obj.name
-                            ))
+                            "[Page:'{0}'] Expected {1} object to be visible "
+                            "but it wasn't"
+                            .format(self.current_step, obj.name))
             self.expectThat(obj.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                                self.current_step, obj.name
-                            ))
+                            "[Page:'{0}'] Expected {1} objects label value to "
+                            "contain text but it didn't"
+                            .format(self.current_step, obj.name))
             self.expectIsInstance(obj.label, str,
-                                  "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, obj.name
-                                  ))
+                                  "[Page:'{0}'] Expected {1} objects label "
+                                  "value to be unicode but it wasn't"
+                                  .format(self.current_step, obj.name))
             if self.english_install:
                 #if english install check english values
                 self.eng_config = eng_label_values.stepUserInfo
@@ -608,7 +661,8 @@
 
         self._check_page_titles()
         if self.english_install:
-            self.expectThat(self.current_page_title, Equals(self.eng_config['page_title']))
+            self.expectThat(self.current_page_title,
+                            Equals(self.eng_config['page_title']))
 
         self._check_navigation_buttons(continue_button=True, back_button=True,
                                        quit_button=False, skip_button=False)
@@ -623,24 +677,28 @@
         #TODO: add checks to the U1 page
 
     def progress_page_tests(self, ):
-        #TODO: move here from emulator and use process manager to check window stack doesn't change
-        # during the progress stage and if a dialog becomes top of stack we get
-        # window title to work outwhich one. Currently polling on dbus for two specific dialogs is really horrible
+        # TODO: move here from emulator and use process manager to check window
+        # stack doesn't change during the progress stage and if a dialog
+        # becomes top of stack we get window title to work outwhich one.
+        # Currently polling on dbus for two specific dialogs is really horrible
         # for the logs and test design so need to find a cleaner way.
         pass
 
     def _add_new_partition(self, ):
         """ adds a new partition """
         logger.debug("_add_new_partition()")
-        custom_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPartAdvanced')
+        custom_page = self.main_window.select_single(
+            'GtkAlignment',
+            BuilderName='stepPartAdvanced')
         tree_view = custom_page.select_single('GtkTreeView')
         item = tree_view.select_item(u'  free space')
         self.pointing_device.click_object(item)
         self.assertThat(item.selected, Equals(True),
-                        "[Page:'{0}'] Free Space tree item not selected".format(
-                            self.current_step
-                        ))
-        add_button = custom_page.select_single('GtkToolButton', BuilderName='partition_button_new')
+                        "[Page:'{0}'] Free Space tree item not selected"
+                        .format(self.current_step))
+        add_button = custom_page.select_single(
+            'GtkToolButton',
+            BuilderName='partition_button_new')
         self.pointing_device.click_object(add_button)
         time.sleep(2)
         logger.debug('_add_new_partition complete')
@@ -649,17 +707,19 @@
         """ Checks that the partition was created properly """
         time.sleep(5)
         # TODO: This needs fixing
-        custom_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPartAdvanced')
+        custom_page = self.main_window.select_single(
+            'GtkAlignment',
+            BuilderName='stepPartAdvanced')
         tree_view = custom_page.select_single('GtkTreeView')
         items = tree_view.get_all_items()
         print('partition_tree_items')
-        print('--------------------------------------------------------------')
+        print('-' * 78)
         for item in items:
             if item.accessible_name == u'':
                 print('empty item ------------')
             else:
                 print(item.accessible_name)
-        print('-----------------------------------------------------------------')
+        print('-' * 78)
 
         #root = self.get_root_instance()
         #item = root.select_single('GtkTextCellAccessible',
@@ -699,104 +759,119 @@
 
     def _update_page_titles(self, ):
         self.previous_page_title = self.current_page_title
-        self.current_page_title = self.main_window.select_single('GtkLabel',
-                                                                 BuilderName='page_title').label
+        self.current_page_title = self.main_window.select_single(
+            'GtkLabel',
+            BuilderName='page_title').label
 
     def _check_page_titles(self, ):
-        current_page_title = self.main_window.select_single('GtkLabel',
-                                                            BuilderName='page_title')
-        message_one = "Expected %s page title '%s' to not equal \
-        the previous %s page title '%s' but it does" % \
-                      (self.current_step, self.current_page_title, self.step_before, self.previous_page_title)
+        current_page_title = self.main_window.select_single(
+            'GtkLabel',
+            BuilderName='page_title')
+        message_one = "Expected %s page title '%s' to not equal the "\
+            "previous %s page title '%s' but it does" % (
+                self.current_step, self.current_page_title,
+                self.step_before, self.previous_page_title)
 
-        self.expectThat(self.previous_page_title, NotEquals(self.current_page_title), message=message_one)
-        # THis second one catches the known bug for the stepPartAdvanced page title switching back to the prev page title
-        message_two = "Expected %s page title '%s' to not equal the previous %s page title '%s' but it does" % \
-                      (self.current_step, current_page_title.label, self.step_before, self.previous_page_title)
-        #This only runs if the current page title changes from its initial value when page loaded
+        self.expectThat(self.previous_page_title,
+                        NotEquals(self.current_page_title),
+                        message=message_one)
+        # This second one catches the known bug for the stepPartAdvanced page
+        # title switching back to the prev page title
+        message_two = "Expected %s page title '%s' to not equal the previous "\
+            "%s page title '%s' but it does" % (
+                self.current_step, current_page_title.label,
+                self.step_before, self.previous_page_title)
+        # This only runs if the current page title changes from its initial
+        # value when page loaded
         if current_page_title.label != self.current_page_title:
             self.expectThat(self.previous_page_title,
-                            NotEquals(current_page_title.label), message=message_two)
+                            NotEquals(current_page_title.label),
+                            message=message_two)
             self.expectThat(current_page_title.visible, Equals(True),
-                            "[Page:'{0}'] Expect page title to be visible but it wasn't".format(
-                                self.current_step
-                            ))
+                            "[Page:'{0}'] Expect page title to be visible but "
+                            "it wasn't".format(self.current_step))
 
-    def _check_preparing_statebox(self, stateboxName, visible=True, imagestock='gtk-yes'):
+    def _check_preparing_statebox(self, stateboxName, visible=True,
+                                  imagestock='gtk-yes'):
         """ Checks the preparing page statebox's """
         logger.debug("Running checks on {0} StateBox".format(stateboxName))
-        preparing_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPrepare')
-        state_box = preparing_page.select_single('StateBox', BuilderName=stateboxName)
+        preparing_page = self.main_window.select_single(
+            'GtkAlignment', BuilderName='stepPrepare')
+        state_box = preparing_page.select_single(
+            'StateBox', BuilderName=stateboxName)
         logger.debug('check({0}, {1})'.format(visible, imagestock))
         logger.debug("Running checks.......")
         if visible:
             self.expectThat(state_box.visible, Equals(visible),
-                            "StateBox.check(): Expected {0} statebox to be visible but it wasn't".format(
-                                state_box.name))
+                            "StateBox.check(): Expected {0} statebox to be "
+                            "visible but it wasn't"
+                            .format(state_box.name))
             label = state_box.select_single('GtkLabel')
             self.expectThat(label.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} Statebox's label to contain text but it didn't".format(
-                                self.current_step, stateboxName
-                            ))
+                            "[Page:'{0}'] Expected {1} Statebox's label to "
+                            "contain text but it didn't"
+                            .format(self.current_step, stateboxName))
             self.expectThat(label.visible, Equals(visible),
-                            "[Page:'{0}'] Expected {1} Statebox label's visible property to be {2} ".format(
-                                self.current_step, stateboxName, str(visible)
-                            ))
+                            "[Page:'{0}'] Expected {1} Statebox label's "
+                            "visible property to be {2} "
+                            .format(self.current_step, stateboxName,
+                                    str(visible)))
             self.expectIsInstance(label.label, str,
-                                  "[Page:'{0}'] Expected {1} Statebox's label to be unicode but it wasn't".format(
-                                  self.current_step, stateboxName
-                                  ))
+                                  "[Page:'{0}'] Expected {1} Statebox's label "
+                                  "to be unicode but it wasn't"
+                                  .format(self.current_step, stateboxName))
             image = state_box.select_single('GtkImage')
             self.expectThat(image.stock, Equals(imagestock))
             self.expectThat(image.visible, Equals(visible))
 
         else:
             self.expectThat(state_box.visible, Equals(False),
-                            "[Page:'{0}'] Expected {1} statebox to not be visible but it was".format(
-                                self.current_step, stateboxName
-                            ))
+                            "[Page:'{0}'] Expected {1} statebox to not be "
+                            "visible but it was"
+                            .format(self.current_step, stateboxName))
 
     def _options_tests(self, visible=[], hidden=[]):
 
-        install_type_page = self.main_window.select_single('GtkAlignment', BuilderName='stepPartAsk')
+        install_type_page = self.main_window.select_single(
+            'GtkAlignment',
+            BuilderName='stepPartAsk')
 
         for option in visible:
             logger.info("selecting Visible object'{0}'".format(option))
             opt = install_type_page.select_single(BuilderName=option)
             self.expectThat(opt.visible, Equals(True),
-                            "[Page:'{0}'] Expected {1} object to be visible but it wasn't".format(
-                                self.current_step, opt.name
-                            ))
+                            "[Page:'{0}'] Expected {1} object to be visible "
+                            "but it wasn't"
+                            .format(self.current_step, opt.name))
             self.expectThat(opt.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                                self.current_step, opt.name
-                            ))
+                            "[Page:'{0}'] Expected {1} objects label value to "
+                            "contain text but it didn't"
+                            .format(self.current_step, opt.name))
             self.expectIsInstance(opt.label, str,
-                                  "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, opt.name
-                                  ))
+                                  "[Page:'{0}'] Expected {1} objects label "
+                                  "value to be unicode but it wasn't"
+                                  .format(self.current_step, opt.name))
             if self.english_install:
                 #if english install check english values
                 self.eng_config = eng_label_values.stepPartAsk
                 self.expectThat(opt.label, Equals(self.eng_config[option]))
 
-
         for option in hidden:
             logger.info("Selecting hidden object '{0}'".format(option))
 
             opt = install_type_page.select_single(BuilderName=option)
             self.expectThat(opt.visible, Equals(False),
-                            "[Page:'{0}'] Expected {1} object to be not visible but it was".format(
-                                self.current_step, opt.name
-                            ))
+                            "[Page:'{0}'] Expected {1} object to be not "
+                            "visible but it was"
+                            .format(self.current_step, opt.name))
             self.expectThat(opt.label, NotEquals(u''),
-                            "[Page:'{0}'] Expected {1} objects label value to contain text but it didn't".format(
-                                self.current_step, opt.name
-                            ))
+                            "[Page:'{0}'] Expected {1} objects label value to "
+                            "contain text but it didn't"
+                            .format(self.current_step, opt.name))
             self.expectIsInstance(opt.label, str,
-                                  "[Page:'{0}'] Expected {1} objects label value to be unicode but it wasn't".format(
-                                  self.current_step, opt.name
-                                  ))
+                                  "[Page:'{0}'] Expected {1} objects label "
+                                  "value to be unicode but it wasn't"
+                                  .format(self.current_step, opt.name))
 
     def _select_install_type(self, install_type):
         pass

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_custom_install.py	2013-11-19 09:56:21 +0000
@@ -13,6 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 from ubiquity_autopilot_tests.tests import UbiquityAutopilotTestCase
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
@@ -23,7 +24,9 @@
 
 
 class CustomInstallTestCase(UbiquityAutopilotTestCase):
-    """ Custom install testcase installs *buntu flavor with custom partition setup """
+    """
+    Custom install testcase installs *buntu flavor with custom partition setup
+    """
 
     def test_custom_install(self, ):
         #first check we have an emulator instance
@@ -61,11 +64,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_default.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_english_default.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_english_default.py	2013-11-19 09:56:21 +0000
@@ -20,8 +20,10 @@
 
 
 class EnglishDefaultInstallTestCase(UbiquityAutopilotTestCase):
-    """ A default install testcase just generally clicks through the installer
-        using all the default values """
+    """
+    A default install testcase just generally clicks through the installer
+    using all the default values
+    """
 
     def test_default_install(self, ):
         #first check we have an emulator instance
@@ -52,11 +54,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_english_encrypt_lvm.py	2013-11-19 09:56:21 +0000
@@ -20,7 +20,10 @@
 
 
 class EnglishLVMEncryptInstallTestCase(UbiquityAutopilotTestCase):
-    """ LVMEncrypt install testcase installs *buntu flavor with LVM-encrypt partition setup """
+    """
+    LVMEncrypt install testcase installs *buntu flavor with LVM-encrypt
+    partition setup
+    """
 
     def test_lvm_encrypt_install(self, ):
         #first check we have an emulator instance
@@ -52,11 +55,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_english_lvm.py	2013-11-19 09:56:21 +0000
@@ -20,7 +20,9 @@
 
 
 class EnglishLVMInstallTestCase(UbiquityAutopilotTestCase):
-    """ LVM install testcase installs *buntu flavor with LVM partition setup """
+    """
+    LVM install testcase installs *buntu flavor with LVM partition setup
+    """
 
     def test_lvm_install(self, ):
         #first check we have an emulator instance
@@ -51,11 +53,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_default.py	2013-11-19 09:56:21 +0000
@@ -20,8 +20,10 @@
 
 
 class DefaultInstallTestCase(UbiquityAutopilotTestCase):
-    """ A default install testcase just generally clicks through the installer
-        using all the default values """
+    """
+    A default install testcase just generally clicks through the installer
+    using all the default values
+    """
 
     def test_default_install(self, ):
         #first check we have an emulator instance
@@ -52,11 +54,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_encrypt_lvm.py	2013-11-19 09:56:21 +0000
@@ -20,7 +20,10 @@
 
 
 class LVMEncryptInstallTestCase(UbiquityAutopilotTestCase):
-    """ LVMEncrypt install testcase installs *buntu flavor with LVM-encrypt partition setup """
+    """
+    LVMEncrypt install testcase installs *buntu flavor with LVM-encrypt
+    partition setup
+    """
 
     def test_lvm_encrypt_install(self, ):
         #first check we have an emulator instance
@@ -53,11 +56,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py'
--- autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py	2013-11-15 17:10:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tests/test_nonenglish_lvm.py	2013-11-19 09:56:21 +0000
@@ -20,7 +20,9 @@
 
 
 class LVMInstallTestCase(UbiquityAutopilotTestCase):
-    """ LVM install testcase installs *buntu flavor with LVM partition setup """
+    """
+    LVM install testcase installs *buntu flavor with LVM partition setup
+    """
 
     def test_lvm_install(self, ):
         #first check we have an emulator instance
@@ -51,11 +53,14 @@
             self.go_to_progress_page()
 
         self.main_window.run_install_progress_page_tests()
-        self.assertThat(lambda: self.app.select_single('GtkDialog', name='finished_dialog').visible,
-                        Eventually(Equals(True)))
+        self.assertThat(lambda: self.app.select_single(
+            'GtkDialog',
+            name='finished_dialog').visible,
+            Eventually(Equals(True)))
         #XXX: Uncomment if you want to restart after install complete
-        ##we need to sleep here to wait for dialog to fully load. It appears in dbus
-        ## before its actually visible. As the test has already passed this doesn't affect outcome
+        ## we need to sleep here to wait for dialog to fully load. It appears
+        ## in dbus before its actually visible. As the test has already passed
+        ## this doesn't affect outcome
         #time.sleep(5)
         #
         #self.keyboard.press_and_release('Enter')

=== modified file 'autopilot/ubiquity_autopilot_tests/tools/_exc.py'
--- autopilot/ubiquity_autopilot_tests/tools/_exc.py	2013-11-01 14:28:55 +0000
+++ autopilot/ubiquity_autopilot_tests/tools/_exc.py	2013-11-19 09:56:21 +0000
@@ -3,4 +3,4 @@
 
 class NonFatalErrors(AssertionError):
     """ Exception class for raising non fatal errors
-    """
\ No newline at end of file
+    """

=== modified file 'autopilot/ubiquity_autopilot_tests/tools/compare.py'
--- autopilot/ubiquity_autopilot_tests/tools/compare.py	2013-11-12 12:02:36 +0000
+++ autopilot/ubiquity_autopilot_tests/tools/compare.py	2013-11-19 09:56:21 +0000
@@ -29,26 +29,26 @@
 
 
 class expectThat(object):
-    """ expectThat is a tool for asserting non-fatal errors
-    
+    """
+    expectThat is a tool for asserting non-fatal errors
+
     It should only be used as to assert non-fatal errors. Errors which it
-    doesn't make sense to halt the test if it fails. At the end of the test you need to
-    use the global non_fatal_errors list and test it is empty
-        
+    doesn't make sense to halt the test if it fails. At the end of the test you
+    need to use the global non_fatal_errors list and test it is empty
+
         i.e self.assertThat(len(non_fatal_errors), Equals(0))
-    
+
     If there are errors then in your test pass each error to self.addDetail()
     and finally re-raise the exception so we get a failed test.
-    
-    This will result in the formatted exceptions stored in the non_fatal_errors list
-    being printed to the test result
-    
+
+    This will result in the formatted exceptions stored in the non_fatal_errors
+    list being printed to the test result
+
     """
 
     def __init__(self, value):
         self.value = value
 
-
     def __getattr__(self, name):
         return getattr(super(expectThat, self), name)
 
@@ -58,8 +58,8 @@
     #now som rich comparisons
     #all we really need is just ==, != and is_unicode and a contains
     def __eq__(self, compareValue, msg=None):
-        message = "Expected {0} but instead we got {1}".format(repr(compareValue),
-                                                               repr(self.value))
+        message = "Expected {0} but instead we got {1}".format(
+            repr(compareValue), repr(self.value))
         try:
             assert self.value == compareValue, message
         except AssertionError:
@@ -84,8 +84,8 @@
         if msg:
             message = msg
         else:
-            message = "Expected {0} to equal {1} but it doesn't!!".format(repr(compareValue),
-                                                               repr(self.value))
+            message = "Expected {0} to equal {1} but it doesn't!!".format(
+                repr(compareValue), repr(self.value))
         try:
             assert self.value == compareValue, message
         except AssertionError:
@@ -93,7 +93,7 @@
             global non_fatal_errors
             e = traceback.format_exc(limit=5)
             non_fatal_errors.append(e)
-        
+
     def not_equals(self, compareValue, msg=None):
         if msg:
             message = msg
@@ -110,11 +110,11 @@
             non_fatal_errors.append(e)
 
     def is_unicode(self, msg=None):
-        if msg:    
+        if msg:
             message = msg
         else:
-            message = "Expected to be instance of type 'unicode' but is an instance of type '{0}'".format(
-                self.value.__class__.__name__)
+            message = "Expected to be instance of type 'unicode' but is an "\
+                "instance of type '{0}'".format(self.value.__class__.__name__)
         try:
             assert isinstance(self.value, str), message
         except AssertionError as e:
@@ -126,7 +126,8 @@
         if msg:
             message = msg
         else:
-            message = '{0} does not contain {1}.'.format(repr(self.value), repr(compareValue))
+            message = '{0} does not contain {1}.'.format(
+                repr(self.value), repr(compareValue))
         try:
             assert compareValue in self.value, message
         except AssertionError as e:
@@ -138,8 +139,8 @@
         if msg:
             message = msg
         else:
-            message = 'Expected {0} to almost equal {1}, but it doesnt'.format(repr(self.value),
-                                                                               repr(compareValue))
+            message = 'Expected {0} to almost equal {1}, but it '\
+                'doesnt'.format(repr(self.value), repr(compareValue))
         try:
             result = self._approx_equal(self.value, compareValue)
             assert result, message

=== modified file 'autopilot/ubiquity_autopilot_tests/unittests/test_matchers.py'
--- autopilot/ubiquity_autopilot_tests/unittests/test_matchers.py	2013-11-01 10:04:29 +0000
+++ autopilot/ubiquity_autopilot_tests/unittests/test_matchers.py	2013-11-19 09:56:21 +0000
@@ -12,4 +12,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-

=== modified file 'tests/run-pep8'
--- tests/run-pep8	2013-08-29 00:23:26 +0000
+++ tests/run-pep8	2013-11-19 09:56:21 +0000
@@ -4,4 +4,4 @@
 
 pep8 --exclude keyboard_names.py --exclude Keyboard.py \
     $(grep -lr '#!.*bin/python' bin) \
-    scripts tests tests/run tests/run-frontend ubiquity
+    scripts tests tests/run tests/run-frontend ubiquity autopilot