Merge lp:~javier.collado/ubuntu-test-cases/desktop-minconfig into lp:~javier.collado/ubuntu-test-cases/desktop

[Javier Collado]

This branch contains the migration of the minimal configuration test cases that
can be found in:
lp:~pwlars/ubuntu-test-cases/desktop-minconfig

[Javier Collado (javier.collado)]

@Paul

I'm creating this merge request to keep a record of the changes to get the
minimal config scenario working in Launchpad just in case you want to take a
look at it in the future.

Anyway, I'm merging this now and marking also your branch:
lp:~pwlars/ubuntu-test-cases/desktop-minconfig

as merged since the work here is based on the test cases there. Also, I'll
create the jobs needed for this scenario and give it a try to see how it works
in a jenkins instance.

[Javier Collado (javier.collado)]

As explained above, I'm approving this merge request myself, but I'm open to
any comment or feedback.

review: Approve

[Paul Larson (pwlars)]

Thanks for doing this, I just got back from vacation today, sorry for not seeing it sooner. Does this completely replace my previous branch? Is there anything in here continues to depend on my previous code, or can it be removed now?

[Javier Collado (javier.collado)]

Yes, your branch should be replaced by the changes in this branch.

There are a couple of jobs created based on these changes:
raring-desktop-i386-smoke-min_config
raring-desktop-amd64-smoke-min_config

=== modified file 'configs/oem.conf'
--- configs/oem.conf	2012-12-07 21:45:35 +0000
+++ configs/oem.conf	2013-01-04 08:39:19 +0000
@@ -1,4 +1,4 @@
 {
-    "sshprivatekey": "~/.ssh/utah", 
-    "user": "oem" 
+    "sshprivatekey": "~/.ssh/utah",
+    "user": "oem"
 }

=== added symlink 'preseeds/min_config.cfg'
=== target is u'default.cfg'
=== added file 'runlists/min_config.run'
--- runlists/min_config.run	1970-01-01 00:00:00 +0000
+++ runlists/min_config.run	2013-01-04 08:39:19 +0000
@@ -0,0 +1,11 @@
+testsuites:
+  - name: usit
+    fetch_method: bzr-export
+    fetch_location: lp:~javier.collado/ubuntu-test-cases/desktop/testsuites/usit
+    include_tests:
+      - read_write
+      - dbus_machine_id
+      - total_mem
+      - total_disk
+      - disk_not_full
+      - out_of_memory

=== added file 'scripts/min_config.sh'
--- scripts/min_config.sh	1970-01-01 00:00:00 +0000
+++ scripts/min_config.sh	2013-01-04 08:39:19 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Run default scenario
+SCRIPT_DIR=$(readlink -e $(dirname $0))
+SCRIPT=$(basename $0)
+SCRIPT_NAME=${SCRIPT%.*}
+BRANCH_DIR=${BRANCH_DIR:-lp:~javier.collado/ubuntu-test-cases/desktop}
+PRESEED=$BRANCH_DIR/preseeds/$SCRIPT_NAME.cfg
+RUNLIST=$BRANCH_DIR/runlists/$SCRIPT_NAME.run
+
+. $SCRIPT_DIR/base.sh
+parse_args "$@"
+echo $CMD --gigabytes 5

=== modified file 'testsuites/usit/dbus_machine_id/test.py'
--- testsuites/usit/dbus_machine_id/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/dbus_machine_id/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Machine ID file exists and it was created recently."""
+
 import logging
 import os.path
 import unittest
@@ -32,9 +34,7 @@
     EXPECTED_AGE = 300
 
     def test_machine_id(self):
-        """
-        Machine Id is there and log content and age
-        """
+        """Machine Id is there and log content and age."""
         logging.info('Checking that machine id file {!r} exists...'
                      .format(self.MACHINE_ID_FILE))
         self.assertTrue(os.path.exists(self.MACHINE_ID_FILE))

=== modified file 'testsuites/usit/desktop_shortcut_exists/test.py'
--- testsuites/usit/desktop_shortcut_exists/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/desktop_shortcut_exists/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Desktop shortcut exists."""
+
 import logging
 import unittest
 import os
@@ -28,9 +30,7 @@
     DESKTOP_SHORTCUT_PATH = '/home/oem/Desktop/oem-config-prepare-gtk.desktop'
 
     def test_desktop_shortcut_exists(self):
-        """
-        Test if the desktop shortcut has been created successfully
-        """
+        """Test if the desktop shortcut has been created successfully."""
         logging.info('Checking if desktop shortcut ({}) exists'
                      .format(self.DESKTOP_SHORTCUT_PATH))
         self.assertTrue(os.path.exists(self.DESKTOP_SHORTCUT_PATH),

=== added directory 'testsuites/usit/disk_not_full'
=== added file 'testsuites/usit/disk_not_full/tc_control'
--- testsuites/usit/disk_not_full/tc_control	1970-01-01 00:00:00 +0000
+++ testsuites/usit/disk_not_full/tc_control	2013-01-04 08:39:19 +0000
@@ -0,0 +1,9 @@
+description: Check that root partition isn't completely full
+dependencies: coreutils
+action: |
+ 1. Get root partition usage
+expected_results: |
+ 1. Current usage is less than 100%
+type: userland
+command: ./test.py
+run_as: utah

=== added file 'testsuites/usit/disk_not_full/test.py'
--- testsuites/usit/disk_not_full/test.py	1970-01-01 00:00:00 +0000
+++ testsuites/usit/disk_not_full/test.py	2013-01-04 08:39:19 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2012, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-test-cases.
+#
+# ubuntu-test-cases is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-test-cases 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-test-cases.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+"""Check that root partition isn't completely full.
+
+Note: There isn't any threshold defined, any value below 100% usage would be
+considered as a pass.
+
+"""
+
+import logging
+import unittest
+import subprocess
+import re
+
+
+class DiskNotFullTest(unittest.TestCase):
+
+    def test_disk_not_full(self):
+        """Check that root partition isn't completely full."""
+        logging.info('Getting disk usage...')
+        process = subprocess.Popen('df', stdout=subprocess.PIPE)
+        stdout, _stderr = process.communicate()
+        logging.info('Disk usage:\n{}'.format(stdout))
+        logging.info('Parsing root partition usage...')
+        root_line = next(line for line in stdout.splitlines()
+                         if line.endswith('/'))
+        use_str = root_line.split()[4]
+        match = re.match('(\d+)%', use_str)
+        self.assertTrue(match,
+                        "Unable to parse root partition use percentage: {}"
+                        .format(use_str))
+        use = int(match.group(1))
+        logging.info('Root partition usage is: {}%'.format(use))
+        self.assertLess(use, 100,
+                        'Root filesystem must *not* be full after install')
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG,
+                        format='%(levelname)s: %(message)s')
+    unittest.main()

=== modified file 'testsuites/usit/empty_startup_app/setup.py'
--- testsuites/usit/empty_startup_app/setup.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/empty_startup_app/setup.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Check imagemagic is installed."""
+
 import logging
 import apt
 
@@ -25,9 +27,7 @@
 
 
 def main():
-    """
-    Check imagemagic is installed
-    """
+    """Check imagemagic is installed."""
     logging.info('Getting apt cache')
     cache = apt.cache.Cache()
 

=== modified file 'testsuites/usit/empty_startup_app/test.py'
--- testsuites/usit/empty_startup_app/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/empty_startup_app/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Startup application list is empty."""
+
 import logging
 import unittest
 import subprocess
@@ -32,9 +34,7 @@
     IMAGE_SIZE = '400x300'
 
     def test_empty_startup_app_test(self):
-        """
-        Startup application list is empty
-        """
+        """Startup application list is empty."""
         logging.info('Launching {!r}...'.format(self.APP_BINARY))
         app_process = subprocess.Popen(self.APP_BINARY)
         time.sleep(1)  # Wait for the application window to be displayed

=== modified file 'testsuites/usit/encrypted_home_content/test.py'
--- testsuites/usit/encrypted_home_content/test.py	2012-08-28 16:14:15 +0000
+++ testsuites/usit/encrypted_home_content/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,18 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Test encrypted home content.
+
+Requires root access to access these links
+
+If it is not mounted there are 2 symlinks:
+Access-Your-Private-Data.desktop ->
+    /usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop
+README.txt -> /usr/share/ecryptfs-utils/ecryptfs-mount-private.txt
+
+"""
+
+
 import logging
 import unittest
 import os
@@ -32,16 +44,7 @@
     PRIVATE_DIR = os.path.join(HOMEDIR, '.Private')
 
     def test_encrypted_home_content(self):
-        """
-        Test encrypted home content
-
-        Requires root access to access these links
-
-        If it is not mounted there are 2 symlinks:
-        Access-Your-Private-Data.desktop ->
-            /usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop
-        README.txt -> /usr/share/ecryptfs-utils/ecryptfs-mount-private.txt
-        """
+        """Test encrypted home content."""
         logging.info('Checking that home directory ({!r}) exists'
                      .format(self.HOMEDIR))
         self.assertTrue(os.path.exists(self.HOMEDIR),

=== modified file 'testsuites/usit/encrypted_home_permissions/test.py'
--- testsuites/usit/encrypted_home_permissions/test.py	2012-08-28 16:14:15 +0000
+++ testsuites/usit/encrypted_home_permissions/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,12 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Test permissions of encrypted home directory.
+
+Must be owned by ubuntu and mode set to 0500 if not mounted or 0700 if mounted
+
+"""
+
 import logging
 import unittest
 import os
@@ -29,12 +35,7 @@
     HOMEDIR = os.path.join('/home', USER)
 
     def test_encrypted_home_permissions(self):
-        """
-        Test permissions of encrypted home directory
-
-        Must be owned by ubuntu and mode set to 0500 if not
-        mounted or 0700 if mounted
-        """
+        """Test permissions of encrypted home directory."""
         logging.info('Checking that home directory ({!r}) exists'
                      .format(self.HOMEDIR))
         self.assertTrue(os.path.exists(self.HOMEDIR),
@@ -49,9 +50,10 @@
         else:
             logging.info('Home directory is *not* mounted')
             expected_permissions = 0700
-        self.assertEqual(permissions, expected_permissions,
-                'Home directory permissions ({:o}) should be set to {:o}'
-                .format(permissions, expected_permissions))
+        self.assertEqual(
+            permissions, expected_permissions,
+            'Home directory permissions ({:o}) should be set to {:o}'
+            .format(permissions, expected_permissions))
         logging.info('Permissions ({:o}) are correctly set'
                      .format(permissions))
 

=== modified file 'testsuites/usit/no_rofs_machine_id/test.py'
--- testsuites/usit/no_rofs_machine_id/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/no_rofs_machine_id/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Machine ID doesn't exist on the rofs."""
+
 import logging
 import os
 import unittest
@@ -28,9 +30,7 @@
     ROFS_DIR = '/rofs'
 
     def test_no_rofs_machine_id(self):
-        """
-        Machine ID doesn't exsit on the rofs
-        """
+        """Machine ID doesn't exist on the rofs."""
         rofs_machine_id = os.path.join(self.ROFS_DIR, self.MACHINE_ID_FILE)
         logging.info("Checking that machine id file under {} ({}) "
                      "doesn't exist"

=== modified file 'testsuites/usit/oem_pkg_installed/test.py'
--- testsuites/usit/oem_pkg_installed/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/oem_pkg_installed/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""OEM packages are installed."""
+
 import logging
 import unittest
 import apt
@@ -27,9 +29,7 @@
     PACKAGE_NAMES = ('oem-config', 'oem-config-gtk')
 
     def test_oem_pkg_intalled(self):
-        """
-        OEM packages are installed
-        """
+        """OEM packages are installed."""
         logging.info('Getting apt cache...')
         cache = apt.cache.Cache()
 

=== added directory 'testsuites/usit/out_of_memory'
=== added file 'testsuites/usit/out_of_memory/tc_control'
--- testsuites/usit/out_of_memory/tc_control	1970-01-01 00:00:00 +0000
+++ testsuites/usit/out_of_memory/tc_control	2013-01-04 08:39:19 +0000
@@ -0,0 +1,11 @@
+description: Check that kernel ring buffer doesn't contain any out of memory error
+dependencies: util-linux
+action: |
+ 1. Read kernel ring buffer
+ 2. Look for out of memory errors
+expected_results: |
+ 1. The buffer is read successfully
+ 2. There isn't any out of memory error
+type: userland
+command: ./test.py
+run_as: utah

=== added file 'testsuites/usit/out_of_memory/test.py'
--- testsuites/usit/out_of_memory/test.py	1970-01-01 00:00:00 +0000
+++ testsuites/usit/out_of_memory/test.py	2013-01-04 08:39:19 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2012, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-test-cases.
+#
+# ubuntu-test-cases is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-test-cases 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-test-cases.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+"""Check that kernel ring buffer doesn't contain any out of memory error."""
+
+import logging
+import unittest
+import subprocess
+import re
+
+
+class OutOfMemoryTest(unittest.TestCase):
+    OOM_REGEX = re.compile(r'^.*oom-killer.*$', re.MULTILINE)
+
+    def test_out_of_memory(self):
+        """Check that there isn't any out of memory error."""
+        logging.info('Reading kernel ring buffer...')
+        output = subprocess.check_output('dmesg')
+        logging.info('Looking for out of memory pattern...')
+        matches = self.OOM_REGEX.findall(output)
+        logging.info('Pattern found {} times'.format(len(matches)))
+        for match in matches:
+            logging.debug(match)
+        self.assertEqual(len(matches), 0,
+                         'Out of memory pattern found {} times (see above)'
+                         .format(len(matches)))
+
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG,
+                        format='%(levelname)s: %(message)s')
+    unittest.main()

=== modified file 'testsuites/usit/read_write/test.py'
--- testsuites/usit/read_write/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/read_write/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Temporary file can be written."""
+
 import logging
 import os.path
 import unittest
@@ -28,9 +30,7 @@
     CONTENTS = 'a'
 
     def test_read_write(self):
-        """
-        Temporary file can be written
-        """
+        """Temporary file can be written."""
         logging.info('Opening file {!r} for writing...'.format(self.FILENAME))
         f = open(self.FILENAME, 'w')
 

=== added directory 'testsuites/usit/total_disk'
=== added file 'testsuites/usit/total_disk/tc_control'
--- testsuites/usit/total_disk/tc_control	1970-01-01 00:00:00 +0000
+++ testsuites/usit/total_disk/tc_control	2013-01-04 08:39:19 +0000
@@ -0,0 +1,9 @@
+description: Check that disk size is the expected one
+dependencies: util-linux
+action: |
+ 1. Get disk size using `sfdisk`command
+expected_results: |
+ 1. Disk size is the expected value
+type: userland
+command: ./test.py
+run_as: root

=== added file 'testsuites/usit/total_disk/test.py'
--- testsuites/usit/total_disk/test.py	1970-01-01 00:00:00 +0000
+++ testsuites/usit/total_disk/test.py	2013-01-04 08:39:19 +0000
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2012, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-test-cases.
+#
+# ubuntu-test-cases is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-test-cases 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-test-cases.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+"""Check that disk size is the expected one.
+
+Note: This test case assumes expected size (5GB) matches the physical size or
+the size assigned to the virtual machine being tested for the expected device.
+
+"""
+
+import logging
+import unittest
+import subprocess
+
+
+class TotalDiskTest(unittest.TestCase):
+    DEVICE = '/dev/vda'
+    EXPECTED_SIZE = 5242880
+
+    def test_total_disk(self):
+        """Check that disk size is the expected one."""
+        logging.info('Getting disk size for {}'.format(self.DEVICE))
+        command = ['sfdisk', '--show-size', self.DEVICE]
+        size = int(subprocess.check_output(command))
+        logging.info('Disk size is: {}'.format(size))
+        self.assertEqual(size, self.EXPECTED_SIZE,
+                         'Expected disk size ({}), '
+                         'does *not* match expected value: {}'
+                         .format(size, self.EXPECTED_SIZE))
+
+        logging.info('Disk size matches the expected value: {}'
+                     .format(self.EXPECTED_SIZE))
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG,
+                        format='%(levelname)s: %(message)s')
+    unittest.main()

=== added directory 'testsuites/usit/total_mem'
=== added file 'testsuites/usit/total_mem/tc_control'
--- testsuites/usit/total_mem/tc_control	1970-01-01 00:00:00 +0000
+++ testsuites/usit/total_mem/tc_control	2013-01-04 08:39:19 +0000
@@ -0,0 +1,9 @@
+description: Check that total memory is in the expected range
+dependencies: procps
+action: |
+ 1. Get total memory using `free` command
+expected_results: |
+ 1. Total memory is in the expected range
+type: userland
+command: ./test.py
+run_as: utah

=== added file 'testsuites/usit/total_mem/test.py'
--- testsuites/usit/total_mem/test.py	1970-01-01 00:00:00 +0000
+++ testsuites/usit/total_mem/test.py	2013-01-04 08:39:19 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2012, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-test-cases.
+#
+# ubuntu-test-cases is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-test-cases 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-test-cases.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+"""Check that total memory is in the expected range.
+
+Note: This test case assumes the upper bound matches the physical memory or the
+memory assigned to the virtual machine being tested.
+
+"""
+
+import logging
+import unittest
+import subprocess
+
+
+class TotalMemTest(unittest.TestCase):
+    UPPER_BOUND = 512
+    LOWER_BOUND = UPPER_BOUND - 40
+
+    def test_total_mem(self):
+        """Check that total memory is in the expected range."""
+        logging.info('Getting total memory...')
+        stdout = subprocess.check_output(['free', '-m'])
+        lines = stdout.splitlines()
+        mem_line = lines[1].split()
+        self.assertEqual(mem_line[0], 'Mem:',
+                         'Failed to parse memory line: {}'.format(mem_line))
+
+        total_mem = int(mem_line[1])
+        logging.info('Total memory is: {}'.format(total_mem))
+
+        self.assertTrue(
+            self.LOWER_BOUND < total_mem < self.UPPER_BOUND,
+            "Total memory ({} MB) is *not* in the expected range: "
+            "({} MB - {} MB)"
+            .format(total_mem, self.LOWER_BOUND, self.UPPER_BOUND))
+
+        logging.info("Total memory ({} MB) is in the expected range: "
+                     "({} MB - {} MB)"
+                     .format(total_mem, self.LOWER_BOUND, self.UPPER_BOUND))
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG,
+                        format='%(levelname)s: %(message)s')
+    unittest.main()

=== modified file 'testsuites/usit/tslist.run'
--- testsuites/usit/tslist.run	2012-08-23 14:55:59 +0000
+++ testsuites/usit/tslist.run	2013-01-04 08:39:19 +0000
@@ -7,3 +7,7 @@
 - test: desktop_shortcut_exists
 - test: oem_pkg_installed
 - test: ubiquity
+- test: total_mem
+- test: total_disk
+- test: disk_not_full
+- test: out_of_memory

=== modified file 'testsuites/usit/ubiquity/test.py'
--- testsuites/usit/ubiquity/test.py	2012-08-27 16:00:12 +0000
+++ testsuites/usit/ubiquity/test.py	2013-01-04 08:39:19 +0000
@@ -18,6 +18,8 @@
 # along with ubuntu-test-cases.  If not, see
 # <http://www.gnu.org/licenses/>.
 
+"""Ubiquity installation works correctly."""
+
 import logging
 import unittest
 import ldtp
@@ -40,9 +42,7 @@
     TXT_PASSWORD2 = 'txtverifiedpassword'  # Password confirmation
 
     def _waittillenabled(self, ui, component_name, timeout=300):
-        """
-        Wait until widget is enabled
-        """
+        """Wait until widget is enabled."""
         ldtp.wait(15)  # UI is slow to react sometimes
         component = ui.getchild(component_name)
         while not component.stateenabled():
@@ -55,9 +55,7 @@
         return True
 
     def test_ubiquity(self):
-        """
-        Ubiquity installation works correctly
-        """
+        """Ubiquity installation works correctly."""
         # Content to fill the forms with
         data = {
             'location': 'London',