ubuntu-system-settings

Merge lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix into lp:ubuntu-system-settings

pep8_pyflakes_fix
Merge into trunk

Proposed by Omer Akram on 2014-02-24

Status:	Superseded
Proposed branch:	lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix
Merge into:	lp:ubuntu-system-settings
Diff against target:	762 lines (+236/-121) 12 files modified debian/control (+2/-0) debian/rules (+3/-0) debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py (+14/-4) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+43/-39) tests/autopilot/ubuntu_system_settings/tests/test_about.py (+11/-6) tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+19/-15) tests/autopilot/ubuntu_system_settings/tests/test_datetime.py (+17/-10) tests/autopilot/ubuntu_system_settings/tests/test_plugins.py (+69/-31) tests/autopilot/ubuntu_system_settings/tests/test_search.py (+5/-7) tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py (+1/-6) tests/autopilot/ubuntu_system_settings/utils/i18n.py (+5/-3) tests/test_code.py (+47/-0)
To merge this branch:	bzr merge lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-02-24	Approve on 2014-03-10
PS Jenkins bot	continuous-integration		Approve on 2014-03-10
Review via email: mp+207966@code.launchpad.net

This proposal has been superseded by a proposal from 2014-03-11.

Commit message

autopilot tests code:
* fix pep8 and pyflakes warnings.
* add tests to make sure we don't regress on pep8/pyflakes

Description of the change

fix pep8 and pyflakes warning, our tests are now pep8 and pyflakes compliant.

This branch is a prerequisite for many to come in a series to improve autopilot tests for ubuntu-system-settings

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/657/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/658/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/661/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/663/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/664/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/666/rebuild

review: Approve (continuous-integration)

Revision history for this message

Omer Akram (om26er) wrote on 2014-02-27:

Finally \o/ -- Its read for review now.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/668/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/670/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-02-28:

Thanks for the work there, nice job, some comments though:

- why do you drop the use of translations? some of us run non-english locales and it's important to be able to run the tests under those

- why those sort of changes

690 - """ Checks whether the Battery plugin is not available as we have no battery """
691 - self.assertThat(lambda: self.main_view.select_single(objectName='entryComponent-battery'),
692 - raises(StateNotFoundError))
693 + """ Checks whether the Battery plugin is not available as we
694 + have no battery
695 +
696 + """

the emtpy line at the end of the comment seems weird?

- could you add a test that runs pep8 and pyflake? so we can make sure we don't introduce new issues with futur commits

review: Needs Fixing

Revision history for this message

Omer Akram (om26er) wrote on 2014-03-06:

sorry for not replying, I am on vacation this week, will fix this MR when I
get back on Monday.

On Thu, Mar 6, 2014 at 4:55 PM, Sebastien Bacher <email address hidden> wrote:

> The proposal to merge lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix
> into lp:ubuntu-system-settings has been updated.
>
> Status: Needs review => Work in progress
>
> For more details, see:
>
> https://code.launchpad.net/~om26er/ubuntu-system-settings/pep8_pyflakes_fix/+merge/207966
> --
>
> https://code.launchpad.net/~om26er/ubuntu-system-settings/pep8_pyflakes_fix/+merge/207966
> You are the owner of lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix.
>

Revision history for this message

Omer Akram (om26er) wrote on 2014-03-09:

> Thanks for the work there, nice job, some comments though:
>
Thanks for the review.

> - why do you drop the use of translations? some of us run non-english locales
> and it's important to be able to run the tests under those
>

In an optimal world we should not be testing labels in our apps because they are well tested in the UIToolkit, but in this case there are many places where we are testing label text which we should not be, My Further branches for system-settings will try and remove the reliability on labels as much as possible.

Instead of translating I am making sure that the app always loads en.US note:

35 + self.patch_environment('LC_MESSAGES', 'en_US.UTF-8')

> - why those sort of changes
>
> 690 - """ Checks whether the Battery plugin is not available as we have no
> battery """
> 691 - self.assertThat(lambda: self.main_view.select_single(objectName
> ='entryComponent-battery'),
> 692 - raises(StateNotFoundError))
> 693 + """ Checks whether the Battery plugin is not available as we
> 694 + have no battery
> 695 +
> 696 + """
>
> the emtpy line at the end of the comment seems weird?
>

Fixed that.

> - could you add a test that runs pep8 and pyflake? so we can make sure we
> don't introduce new issues with futur commits

Added two new tests to test both pyflakes and pep8, they currently are skipped if the related tool is not installed, do you think it makes sense for our suite to depend on pyflakes and pep8 ?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/686/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/687/rebuild

review: Approve (continuous-integration)

lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix updated on 2014-03-10

641. By Omer Akram on 2014-03-10: don't remove string translations, they need to stay

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/688/rebuild

review: Approve (continuous-integration)

lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix updated on 2014-03-10

642. By Omer Akram on 2014-03-10: run python static code test during build, also fix some pep8 complaints in the migrator script

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/689/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-03-10:

Looks good now, thanks!

review: Approve

lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix updated on 2014-03-11

643. By Omer Akram on 2014-03-11: merge in laney' branch to base this one on it

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Omer Akram

Ubuntu Touch System Settings

 === modified file 'debian/control'
 --- debian/control	2014-03-03 17:03:21 +0000
 +++ debian/control	2014-03-11 14:59:49 +0000
@@ -24,6 +24,8 @@
                 libapt-pkg-dev,
                 xvfb,
                 cmake,
++               pep8,
++               pyflakes,
  Standards-Version: 3.9.4
  Homepage: https://launchpad.net/ubuntu-system-settings
  # If you aren't a member of ~system-settings-touch but need to upload packaging
 === modified file 'debian/rules'
 --- debian/rules	2014-03-03 17:03:21 +0000
 +++ debian/rules	2014-03-11 14:59:49 +0000
@@ -21,3 +21,6 @@
  %:
  	dh $@ --fail-missing --with python2,migrations
++
++override_dh_auto_test:
++	python tests/test_code.py
 === modified file 'debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py' (properties changed: -x to +x)
 --- debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py	2014-01-09 13:02:44 +0000
 +++ debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py	2014-03-11 14:59:49 +0000
@@ -20,9 +20,12 @@
  # Migrate ubuntu-system-settings sound panel settings from GSettings to
  # AccountsService
--
++
++from __future__ import print_function
++
  import dbus
  import os
++import sys
  from gi.repository import Gio
@@ -30,20 +33,27 @@
  manager_proxy = system_bus.get_object('org.freedesktop.Accounts',
                                        '/org/freedesktop/Accounts')
  object_path = manager_proxy.FindUserById(
--        os.getuid(), dbus_interface='org.freedesktop.Accounts')
++    os.getuid(), dbus_interface='org.freedesktop.Accounts'
++)
  user_proxy = system_bus.get_object('org.freedesktop.Accounts', object_path)
  gsettings = Gio.Settings(schema="com.ubuntu.touch.sound")
++
  def get_string(key):
      return gsettings.get_string(key)
++
  def get_bool(key):
      return gsettings.get_boolean(key)
++
  def set_as_setting(interface, setting, value):
--    user_proxy.Set(interface, setting, value,
--                   dbus_interface=dbus.PROPERTIES_IFACE)
++    try:
++        user_proxy.Set(interface, setting, value,
++                       dbus_interface=dbus.PROPERTIES_IFACE)
++    except dbus.exceptions.DBusException as e:
++        print("Couldn't update %s: %s" % (setting, e), file=sys.stderr)
  # (gsettings key, accountsservice key, function to retrieve from gsettings)
  keys = [('silent-mode', 'SilentMode', get_bool),
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-02-18 15:42:24 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-03-11 14:59:49 +0000
@@ -13,7 +13,6 @@
  from autopilot.input import Mouse, Touch, Pointer
  from autopilot.platform import model
--from autopilot.testcase import AutopilotTestCase
  from autopilot.matchers import Eventually
  from testtools.matchers import Equals, NotEquals, GreaterThan
@@ -25,12 +24,13 @@
  import subprocess
  from time import sleep
++
  class UbuntuSystemSettingsTestCase(UbuntuUIToolkitAppTestCase):
      """ Base class for Ubuntu System Settings """
      if model() == 'Desktop':
--        scenarios = [ ('with mouse', dict(input_device_class=Mouse)) ]
++        scenarios = [('with mouse', dict(input_device_class=Mouse))]
      else:
--        scenarios = [ ('with touch', dict(input_device_class=Touch)) ]
++        scenarios = [('with touch', dict(input_device_class=Touch))]
      def setUp(self, panel=None):
          super(UbuntuSystemSettingsTestCase, self).setUp()
@@ -40,7 +40,8 @@
      def launch_system_settings(self, panel=None):
          params = ['/usr/bin/system-settings']
          if (model() != 'Desktop'):
--            params.append('--desktop_file_hint=/usr/share/applications/ubuntu-system-settings.desktop')
++            params.append('--desktop_file_hint=/usr/share/applications/'
++                          'ubuntu-system-settings.desktop')
          # Launch to a specific panel
          if panel is not None:
@@ -69,8 +70,8 @@
          page_center_x = int(page_right / 2)
          page_center_y = int(page_bottom / 2)
          while obj.globalRect[1] + obj.height > page_bottom:
--            self.pointer.drag(page_center_x, page_center_y,
--                    page_center_x, page_center_y - obj.height * 2)
++            self.pointer.drag(page_center_x, page_center_y,
++                              page_center_x, page_center_y - obj.height * 2)
              # avoid a flick
              sleep(0.5)
@@ -96,7 +97,9 @@
      def add_mock_battery(self):
          """ Make sure we have a battery """
--        self.dbusmock.AddDischargingBattery('mock_BATTERY', 'Battery', 50.0, 10)
++        self.dbusmock.AddDischargingBattery(
++            'mock_BATTERY', 'Battery', 50.0, 10
++        )
  class UbuntuSystemSettingsBatteryTestCase(UbuntuSystemSettingsUpowerTestCase):
@@ -123,37 +126,39 @@
      def setUp(self, panel=None):
          self.obj_ofono.Reset()
          # Add an available carrier
--        self.dbusmock.AddObject('/ril_0/operator/op2',
--                'org.ofono.NetworkOperator',
--                {
--                    'Name': 'my.cool.telco',
--                    'Status': 'available',
--                    'MobileCountryCode': '777',
--                    'MobileNetworkCode': '22',
--                    'Technologies': ['gsm'],
--                },
--                [
--                    ('GetProperties', '', 'a{sv}',
--                        'ret = self.GetAll("org.ofono.NetworkOperator")'),
--                    ('Register', '', '', ''),
--                ]
--                )
++        self.dbusmock.AddObject(
++            '/ril_0/operator/op2',
++            'org.ofono.NetworkOperator',
++            {
++                'Name': 'my.cool.telco',
++                'Status': 'available',
++                'MobileCountryCode': '777',
++                'MobileNetworkCode': '22',
++                'Technologies': ['gsm'],
++            },
++            [
++                ('GetProperties', '', 'a{sv}',
++                    'ret = self.GetAll("org.ofono.NetworkOperator")'),
++                ('Register', '', '', ''),
++            ]
++        )
          # Add a forbidden carrier
--        self.dbusmock.AddObject('/ril_0/operator/op3',
--                'org.ofono.NetworkOperator',
--                {
--                    'Name': 'my.bad.telco',
--                    'Status': 'forbidden',
--                    'MobileCountryCode': '777',
--                    'MobileNetworkCode': '22',
--                    'Technologies': ['gsm'],
--                },
--                [
--                    ('GetProperties', '', 'a{sv}',
--                        'ret = self.GetAll("org.ofono.NetworkOperator")'),
--                    ('Register', '', '', ''),
--                ]
--                )
++        self.dbusmock.AddObject(
++            '/ril_0/operator/op3',
++            'org.ofono.NetworkOperator',
++            {
++                'Name': 'my.bad.telco',
++                'Status': 'forbidden',
++                'MobileCountryCode': '777',
++                'MobileNetworkCode': '22',
++                'Technologies': ['gsm'],
++            },
++            [
++                ('GetProperties', '', 'a{sv}',
++                    'ret = self.GetAll("org.ofono.NetworkOperator")'),
++                ('Register', '', '', ''),
++            ]
++        )
          super(UbuntuSystemSettingsOfonoTestCase, self).setUp('cellular')
      @property
@@ -194,8 +199,7 @@
          """ Checks whether an space item exists and returns a value """
          item = self.storage_page.select_single(objectName=object_name)
          self.assertThat(item, NotEquals(None))
--        label = item.label # Label
--        space = item.value # Disk space (bytes)
++        label = item.label  # Label
          self.assertThat(label, Equals(text))
          # Get item's label
          size_label = item.select_single(objectName='sizeLabel')
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-01-27 16:17:57 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-03-11 14:59:49 +0000
@@ -8,13 +8,17 @@
  from time import sleep
  from autopilot.platform import model
--from autopilot.matchers import Eventually
  from testtools.matchers import Equals, NotEquals, GreaterThan
  from unittest import expectedFailure
--from ubuntu_system_settings.tests import AboutBaseTestCase, StorageBaseTestCase, LicenseBaseTestCase
++from ubuntu_system_settings.tests import (
++    AboutBaseTestCase,
++    StorageBaseTestCase,
++    LicenseBaseTestCase
++)
  from ubuntu_system_settings.utils.i18n import ugettext as _
++
  class AboutTestCase(AboutBaseTestCase):
      """ Tests for About this phone Page """
@@ -96,7 +100,7 @@
      """ Tests for Storage """
      def test_storage_page(self):
--        """ Check whether Storage page is available """
++        """ Check whether Storage page is available """
          self.assertThat(self.storage_page, NotEquals(None))
      def test_disk(self):
@@ -136,7 +140,9 @@
      def test_installed_apps(self):
          """ Checks whether Installed Apps list is available """
--        installed_apps_list_view = self.storage_page.select_single(objectName='installedAppsListView')
++        installed_apps_list_view = self.storage_page.select_single(
++            objectName='installedAppsListView'
++        )
          self.assertThat(installed_apps_list_view, NotEquals(None))
@@ -145,6 +151,5 @@
      @expectedFailure
      def test_licenses_page(self):
--        """ Check whether Storage page is available """
++        """ Check whether Storage page is available """
          self.assertThat(self.licenses_page, NotEquals(None))
--
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-02-18 12:16:22 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-03-11 14:59:49 +0000
@@ -5,29 +5,28 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from time import sleep
--
  from autopilot.introspection.dbus import StateNotFoundError
--from autopilot.matchers import Eventually
  from testtools.matchers import Equals, NotEquals, raises
--from unittest import expectedFailure
  from ubuntu_system_settings.tests import UbuntuSystemSettingsOfonoTestCase
  from ubuntu_system_settings.utils.i18n import ugettext as _
  from ubuntuuitoolkit import emulators as toolkit_emulators
++
  class CellularTestCase(UbuntuSystemSettingsOfonoTestCase):
      """ Tests for cellular Page """
      def navigate_to_manual(self):
          selector = self.cellular_page.select_single(
--                toolkit_emulators.ItemSelector,
--                objectName="autoChooseCarrierSelector")
++            toolkit_emulators.ItemSelector,
++            objectName="autoChooseCarrierSelector"
++        )
          manual = selector.select_single('Label', text=_("Manually"))
          self.pointer.click_object(manual)
          choosecarrier = self.cellular_page.select_single(
--                objectName="chooseCarrier")
++            objectName="chooseCarrier"
++        )
          self.pointer.click_object(choosecarrier)
          self.assertThat(self.choose_page.title, Equals(_("Carrier")))
@@ -40,8 +39,9 @@
          """ Tests whether the current network is visible and selected """
          self.navigate_to_manual()
          carriers = self.choose_page.select_single(
--                toolkit_emulators.ItemSelector,
--                objectName="carrierSelector")
++            toolkit_emulators.ItemSelector,
++            objectName="carrierSelector"
++        )
          # TODO: Once there is a proper ItemSelector emulator, get the items
          # from it and check 'fake.tel' is the selected one.
          manual = carriers.select_single('Label', text="fake.tel")
@@ -52,8 +52,9 @@
          """ Tests whether an alternative available network is displayed """
          self.navigate_to_manual()
          carriers = self.choose_page.select_single(
--                toolkit_emulators.ItemSelector,
--                objectName="carrierSelector")
++            toolkit_emulators.ItemSelector,
++            objectName="carrierSelector"
++        )
          manual = carriers.select_single('Label', text="my.cool.telco")
          self.assertThat(manual, NotEquals(None))
@@ -61,7 +62,10 @@
          """ Ensures that a forbidden network is not shown """
          self.navigate_to_manual()
          carriers = self.choose_page.select_single(
--                toolkit_emulators.ItemSelector,
--                objectName="carrierSelector")
--        self.assertThat(lambda: carriers.select_single('Label', text="my.bad.telco"),
--            raises(StateNotFoundError))
++            toolkit_emulators.ItemSelector,
++            objectName="carrierSelector"
++        )
++        self.assertThat(
++            lambda: carriers.select_single('Label', text="my.bad.telco"),
++            raises(StateNotFoundError)
++        )
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_datetime.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-01-30 16:42:51 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-03-11 14:59:49 +0000
@@ -5,12 +5,10 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--import dbus
  import dbusmock
  import subprocess
  from time import sleep
--from autopilot.platform import model
  from autopilot.matchers import Eventually
  from testtools.matchers import Equals, NotEquals, GreaterThan
@@ -19,6 +17,7 @@
  from ubuntuuitoolkit import emulators as toolkit_emulators
++
  class TimeDateTestCase(UbuntuSystemSettingsTestCase,
                         dbusmock.DBusTestCase):
      """ Tests for the Time & Date Page """
@@ -27,8 +26,9 @@
      def setUpClass(klass):
          klass.start_system_bus()
          klass.dbus_con = klass.get_dbus(True)
--        (klass.p_mock,klass.obj_timedate1) = klass.spawn_server_template(
--            'timedated', {}, stdout=subprocess.PIPE)
++        (klass.p_mock, klass.obj_timedate1) = klass.spawn_server_template(
++            'timedated', {}, stdout=subprocess.PIPE
++        )
      def setUp(self):
          """ Go to Time & Date page """
@@ -45,7 +45,9 @@
      def click_tz_search_field(self):
          self.scroll_to_and_click(self.tz_page)
--        text_field = self.main_view.select_single(objectName='selectTimeZoneField')
++        text_field = self.main_view.select_single(
++            objectName='selectTimeZoneField'
++        )
          self.pointer.move_to_object(text_field)
      def test_time_date_page(self):
@@ -56,14 +58,17 @@
      def test_tz_list_initially_empty(self):
          """ Checks that no list is displayed initially """
          self.scroll_to_and_click(self.tz_page)
--        labelVisible = self.main_view.select_single(objectName='nothingLabel').visible
++        labelVisible = self.main_view.select_single(
++            objectName='nothingLabel').visible
          self.assertThat(labelVisible, Equals(True))
      def test_searching_tz(self):
          """ Check that searching for a valid location shows something """
          self.click_tz_search_field()
          self.keyboard.type('London, United Kingdom')
--        listview = self.main_view.select_single(objectName='locationsListView')
++        listview = self.main_view.select_single(
++            objectName='locationsListView'
++        )
          self.assertThat(listview.count, GreaterThan(0))
      def test_searching_tz_not_found(self):
@@ -72,7 +77,8 @@
          self.keyboard.type('Oh no you don\'t!')
          listview = self.main_view.select_single(objectName='locationsListView')
          self.assertThat(listview.count, Equals(0))
--        labelVisible = self.main_view.select_single(objectName='nothingLabel').visible
++        labelVisible = self.main_view.select_single(
++            objectName='nothingLabel').visible
          self.assertThat(labelVisible, Equals(True))
      def test_manual_tz_selection(self):
@@ -87,8 +93,9 @@
          self.assertThat(self.tz_page.text, Equals('Europe/London'))
      def test_same_tz_selection(self):
--        """ Check that manually setting a timezone then setting the same one doesn't
--            take you back to the index """
++        """Check that manually setting a timezone then setting the same one
++        doesn't take you back to the index.
++        """
          self.test_manual_tz_selection()
          self.click_tz_search_field()
          # This is also in Europe/London
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_plugins.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2014-01-21 17:23:50 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2014-03-11 14:59:49 +0000
@@ -5,17 +5,18 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from time import sleep
--
  from autopilot.introspection.dbus import StateNotFoundError
  from autopilot.matchers import Eventually
--from testtools.matchers import Contains, Equals, NotEquals, GreaterThan, raises
++from testtools.matchers import Equals, NotEquals, raises
--from ubuntu_system_settings.tests import (UbuntuSystemSettingsTestCase,
--     UbuntuSystemSettingsUpowerTestCase,
--     UbuntuSystemSettingsBatteryTestCase)
++from ubuntu_system_settings.tests import (
++    UbuntuSystemSettingsTestCase,
++    UbuntuSystemSettingsUpowerTestCase,
++    UbuntuSystemSettingsBatteryTestCase
++)
  from ubuntu_system_settings.utils.i18n import ugettext as _
++
  class SystemSettingsTestCases(UbuntuSystemSettingsTestCase):
      """ Tests for Ubuntu System Settings """
@@ -27,30 +28,40 @@
          header = self.main_view.select_single(objectName='systemSettingsPage')
          self.assertThat(header, NotEquals(None))
          self.assertThat(header.title, Eventually(Equals(_('System Settings'))))
--
++
      def test_search(self):
          """ Checks whether the Search box is available """
          search = self.main_view.select_single(objectName='searchTextField')
          self.assertThat(search, NotEquals(None))
--
++
      def test_network_category(self):
          """ Checks whether the Network category is available """
--        category = self.main_view.select_single(objectName='categoryGrid-network')
++        category = self.main_view.select_single(
++            objectName='categoryGrid-network'
++        )
          self.assertThat(category, NotEquals(None))
--        self.assertThat(category.categoryName, Eventually(Equals(_('Network'))))
--
++        self.assertThat(
++            category.categoryName, Eventually(Equals(_('Network')))
++        )
++
      def test_personal_category(self):
          """ Checks whether the Personal category is available """
--        category = self.main_view.select_single(objectName='categoryGrid-personal')
++        category = self.main_view.select_single(
++            objectName='categoryGrid-personal'
++        )
          self.assertThat(category, NotEquals(None))
--        self.assertThat(category.categoryName, Eventually(Equals(_('Personal'))))
--
++        self.assertThat(
++            category.categoryName, Eventually(Equals(_('Personal')))
++        )
++
      def test_system_category(self):
          """ Checks whether the System category is available """
--        category = self.main_view.select_single(objectName='categoryGrid-system')
++        category = self.main_view.select_single(
++            objectName='categoryGrid-system'
++        )
          self.assertThat(category, NotEquals(None))
          self.assertThat(category.categoryName, Eventually(Equals(_('System'))))
--
++
      def test_wifi_plugin(self):
          """ Checks whether the Wi-Fi plugin is available """
          plugin = self.main_view.select_single(objectName='entryComponent-wifi')
@@ -58,70 +69,97 @@
      def test_cellular_plugin(self):
          """ Checks whether the Cellunar plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-cellular')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-cellular'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_bluetooth_plugin(self):
          """ Checks whether the Bluetooth plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-bluetooth')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-bluetooth'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_background_plugin(self):
          """ Checks whether the Background plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-background')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-background'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_sound_plugin(self):
          """ Checks whether the Sound plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-sound')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-sound'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_language_plugin(self):
          """ Checks whether the Language plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-language')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-language'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_accounts_plugin(self):
          """ Checks whether the Accounts plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-online-accounts')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-online-accounts'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_timedate_plugin(self):
          """ Checks whether the Time & Date plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-time-date')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-time-date'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_security_plugin(self):
          """ Checks whether the Security plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-security-privacy')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-security-privacy'
++        )
          self.assertThat(plugin, NotEquals(None))
      def test_updates_plugin(self):
          """ Checks whether the Updates plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-system-update')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-system-update'
++        )
          self.assertThat(plugin, NotEquals(None))
++
  class SystemSettingsUpowerTestCases(UbuntuSystemSettingsUpowerTestCase):
      def setUp(self):
          super(SystemSettingsUpowerTestCases, self).setUp()
      def test_no_battery_plugin_without_battery(self):
--        """ Checks whether the Battery plugin is not available as we have no battery """
--        self.assertThat(lambda: self.main_view.select_single(objectName='entryComponent-battery'),
--            raises(StateNotFoundError))
++        """ Checks whether the Battery plugin is not available as we
++        have no battery.
++        """
++        self.assertThat(lambda: self.main_view.select_single(
++            objectName='entryComponent-battery'),
++            raises(StateNotFoundError)
++        )
      def test_battery_plugin_battery_hotplugging(self):
          """ Checks whether hotplugging a battery makes the panel visible """
          self.add_mock_battery()
--        plugin = self.main_view.select_single(objectName='entryComponent-battery')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-battery'
++        )
          self.assertThat(plugin, NotEquals(None))
++
  class SystemSettingsBatteryTestCases(UbuntuSystemSettingsBatteryTestCase):
      def setUp(self):
          super(SystemSettingsBatteryTestCases, self).setUp()
      def test_battery_plugin(self):
          """ checks whether the Battery plugin is available """
--        plugin = self.main_view.select_single(objectName='entryComponent-battery')
++        plugin = self.main_view.select_single(
++            objectName='entryComponent-battery'
++        )
          self.assertThat(plugin, NotEquals(None))
--
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_search.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-01-17 10:15:31 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-03-11 14:59:49 +0000
@@ -5,12 +5,8 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from time import sleep
--
--from autopilot.matchers import Eventually
  from autopilot.introspection.dbus import StateNotFoundError
--from testtools.matchers import Contains, Equals, NotEquals, GreaterThan
--from unittest import skip
++from testtools.matchers import Equals, NotEquals
  from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
  from ubuntu_system_settings.utils.i18n import ugettext as _
@@ -18,6 +14,7 @@
  """ Tests for Ubuntu System Settings """
++
  class SearchTestCases(UbuntuSystemSettingsTestCase):
      """ Tests for Search """
@@ -37,8 +34,9 @@
          sound = self.main_view.select_single(objectName='entryComponent-sound')
          self.assertThat(sound, NotEquals(None))
          try:
--            background = self.main_view.select_single(objectName='entryComponent-background')
++            background = self.main_view.select_single(
++                objectName='entryComponent-background'
++            )
          except StateNotFoundError:
              background = None
          self.assertThat(background, Equals(None))
--
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py	2014-02-04 21:05:28 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py	2014-03-11 14:59:49 +0000
@@ -5,15 +5,10 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from time import sleep
--
--from autopilot.matchers import Eventually
  from autopilot.introspection.dbus import StateNotFoundError
--from testtools.matchers import Contains, Equals, NotEquals, GreaterThan, raises
--from unittest import skip
++from testtools.matchers import NotEquals, raises
  from ubuntu_system_settings.tests import SystemUpdatesBaseTestCase
--from ubuntu_system_settings.utils.i18n import ugettext as _
  """ Tests for Ubuntu System Settings """
 === modified file 'tests/autopilot/ubuntu_system_settings/utils/i18n.py'
 --- tests/autopilot/ubuntu_system_settings/utils/i18n.py	2013-12-17 17:29:03 +0000
 +++ tests/autopilot/ubuntu_system_settings/utils/i18n.py	2014-03-11 14:59:49 +0000
@@ -8,15 +8,17 @@
  import locale
  import gettext
--APP_NAME='ubuntu-system-settings'
--LOCALE_DIR='/usr/share/locale/'
++APP_NAME = 'ubuntu-system-settings'
++LOCALE_DIR = '/usr/share/locale/'
  lc, encoding = locale.getdefaultlocale()
  if not lc:
      lc = 'C'
--language = gettext.translation(APP_NAME, LOCALE_DIR, languages=[lc], fallback=True)
++language = gettext.translation(
++    APP_NAME, LOCALE_DIR, languages=[lc], fallback=True
++)
  # UTF-8
  ugettext = language.ugettext
 === added file 'tests/test_code.py'
 --- tests/test_code.py	1970-01-01 00:00:00 +0000
 +++ tests/test_code.py	2014-03-11 14:59:49 +0000
@@ -0,0 +1,47 @@
++#!/usr/bin/python
++
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++# Copyright 2014 Canonical
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 3, as published
++# by the Free Software Foundation.
++
++import subprocess
++import sys
++import unittest
++
++
++class StaticCodeTests(unittest.TestCase):
++
++    def _is_tool_installed(tool):
++        return subprocess.call(['which', tool],
++                               stdout=subprocess.PIPE)
++
++    @unittest.skipIf(
++        _is_tool_installed('pyflakes') != 0, 'pyflakes not installed'
++    )
++    def test_pyflakes(self):
++        pyflakes = subprocess.Popen(
++            ['pyflakes', '.'],
++            stdout=subprocess.PIPE, universal_newlines=True
++        )
++        (out, err) = pyflakes.communicate()
++        self.assertEqual(pyflakes.returncode, 0, out)
++
++    @unittest.skipIf(
++        _is_tool_installed('pep8') != 0, 'pep8 not installed'
++    )
++    def test_pep8(self):
++        pep8 = subprocess.Popen(
++            ['pep8', '.'],
++            stdout=subprocess.PIPE, universal_newlines=True
++        )
++        (out, err) = pep8.communicate()
++        self.assertEqual(pep8.returncode, 0, out)
++
++
++if __name__ == '__main__':
++    unittest.main(
++        testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2)
++    )