Merge lp:~vila/u1-test-utils/pep8 into lp:u1-test-utils

[Vincent Ladeuil]

Add pep8/pyflakes for setup_vm.

Add code conformance tests for setup_vm.

Explain why the test_pyflakes_analysis and test_pep8_conformance tests
always succeed.

Fix all pep8 and pyflakes issues which reminds me that I'd really want my
editor to agree with pep8 about continuation lines :-/

[Vincent Ladeuil (vila)]

@Leo: Be fore you ask ;)

511 +from u1testutils.static import (
512 + test_pep8_conformance as pep8,
513 + test_pyflakes_analysis as pyflakes,
514 +)
515 +
516 +
517 +class Pep8ConformanceTestCase(pep8.Pep8ConformanceTestCase):
518 +
519 + packages = [setup_vm]
520 +
521 +
522 +class PyflakesAnalysisTestCase(pyflakes.PyflakesAnalysisTestCase):

That last line was too long with test_pyflakes_analysis so I added the pyflakes alias in anger.

The whole file is short enough (and will remain that way in the foreseeable future) so there is no risk of collision.

[Leo Arias (elopio)]

More pretty code :)
Thanks!

review: Approve (code review)

[lp:~vila/u1-test-utils/pep8]

95. By Vincent Ladeuil on 2013-08-08

The classes under u1testutils/static are not meant to be loaded.

=== modified file 'setup_vm/bin/setup_vm.py'
--- setup_vm/bin/setup_vm.py	2013-08-07 18:21:45 +0000
+++ setup_vm/bin/setup_vm.py	2013-08-08 16:32:55 +0000
@@ -7,14 +7,11 @@
 
 """
 import argparse
-import base64
 from cStringIO import StringIO
 import errno
 import os
 import subprocess
 import sys
-import tempfile
-import time
 
 
 import bzrlib
@@ -87,7 +84,7 @@
              ],
             user_store, mutable_section_id=name)
 
-    if bzrlib.version_info < (2,6):
+    if bzrlib.version_info < (2, 6):
         def get(self, name, expand=True):
             """Override base class to expand by default."""
             return super(VmStack, self).get(name, expand)
@@ -114,9 +111,8 @@
     config.option_registry.register(option)
 
 
-register(config.Option(
-        'vm', default=None,
-        help='''The name space defining a virtual machine.
+register(config.Option('vm', default=None,
+                       help='''The name space defining a virtual machine.
 
 This option is a place holder to document the options that defines a virtual
 machine and the options defining the infrastructure used to manage them all.
@@ -147,9 +143,8 @@
 
 # The directory where we store vm files related to their configuration with
 # cloud-init (user-data, meta-data, ssh keys).
-register(config.Option(
-        'vm.vms_dir', default='~/.config/setup_vm',
-        help='''Where vm related config files are stored.
+register(config.Option('vm.vms_dir', default='~/.config/setup_vm',
+                       help='''Where vm related config files are stored.
 
 This includes user-data and meta-data for cloud-init and ssh server keys.
 
@@ -159,59 +154,43 @@
 name.
 '''))
 # The base directories where vms are stored for kvm
-register(PathOption(
-        'vm.images_dir', default='/var/lib/libvirt/images',
-        help="Where vm disk images are stored.",
-        ))
-register(config.Option(
-        'vm.qemu_etc_dir',
-        default='/etc/libvirt/qemu',
-        help="Where libvirt (qemu) stores the vms config files."
-        ))
+register(PathOption('vm.images_dir', default='/var/lib/libvirt/images',
+                    help='''Where vm disk images are stored.''',))
+register(config.Option('vm.qemu_etc_dir', default='/etc/libvirt/qemu',
+                       help='''\
+Where libvirt (qemu) stores the vms config files.'''))
 
 # Isos and images download handling
-register(config.Option(
-        'vm.iso_url',
-        default='http://cdimage.ubuntu.com/daily-live/current/' ,
-        help="Where an iso can be downloaded from."
-        ))
-register(config.Option(
-        'vm.iso_name',
-        default='{vm.release}-desktop-{vm.cpu_model}.iso',
-        help="The name of the iso."
-        ))
-register(config.Option(
-        'vm.cloud_image_url',
-        default='http://cloud-images.ubuntu.com/{vm.release}/current/',
-        help="Where a cloud image can be downloaded from."
-        ))
-register(config.Option(
-        'vm.cloud_image_name',
-        default='{vm.release}-server-cloudimg-{vm.cpu_model}-disk1.img',
-        help="The name of the cloud image."
-        ))
-register(PathOption(
-        'vm.download_cache',
-        default='{vm.images_dir}',
-        help="Where downloads end up.",
-        ))
+register(config.Option('vm.iso_url',
+                       default='http://cdimage.ubuntu.com/daily-live/current/',
+                       help='''Where an iso can be downloaded from.'''))
+register(config.Option('vm.iso_name',
+                       default='{vm.release}-desktop-{vm.cpu_model}.iso',
+                       help='''The name of the iso.'''))
+register(config.Option('vm.cloud_image_url',
+                       default='''\
+http://cloud-images.ubuntu.com/{vm.release}/current/''',
+                       help='''Where a cloud image can be downloaded from.'''))
+register(config.Option('vm.cloud_image_name',
+                       default='''\
+{vm.release}-server-cloudimg-{vm.cpu_model}-disk1.img''',
+                       help='''The name of the cloud image.'''))
+register(PathOption('vm.download_cache', default='{vm.images_dir}',
+                    help='''Where downloads end up.'''))
 
 # The ubiquitous vm name
-register(config.Option(
-        'vm.name', default=None, invalid='error',
-        help="The vm name, used as a prefix for related files."
-        ))
+register(config.Option('vm.name', default=None, invalid='error',
+                       help='''\
+The vm name, used as a prefix for related files.'''))
 # The second most important bit to define a vm: which ubuntu release ?
-register(config.Option(
-        'vm.release', default=None, invalid='error',
-        help="The ubuntu release name."
-        ))
+register(config.Option('vm.release', default=None, invalid='error',
+                       help='''The ubuntu release name.'''))
 # The third important piece to define a vm: where to store files like the
 # console, the user-data and meta-data files, the ssh server keys, etc.
-register(config.Option(
-        'vm.config_dir', default='{vm.vms_dir}/{vm.name}',
-        invalid='error',
-        help='''The directory where files specific to a vm are stored.
+register(config.Option('vm.config_dir', default='{vm.vms_dir}/{vm.name}',
+                       invalid='error',
+                       help='''\
+The directory where files specific to a vm are stored.
 
 This includes the user-data and meta-data files used at install time (for
 reference and easier debug) as well as the optional ssh server keys.
@@ -220,118 +199,101 @@
 redifining it as long as it ends up being unique for the vm.
 
 {vm.vms_dir}/{vm.release}/{vm.name} may better suit your taste for example.
-'''
-        ))
+'''))
 # The options defining the vm physical characteristics
-register(config.Option(
-        'vm.ram_size', default='1024',
-        help="The ram size in megabytes."
-        ))
-register(config.Option(
-        'vm.disk_size', default='8G',
-        help='''The disk image size in bytes.
+register(config.Option('vm.ram_size', default='1024',
+                       help='''The ram size in megabytes.'''))
+register(config.Option('vm.disk_size', default='8G',
+                       help='''The disk image size in bytes.
 
 Optional suffixes "k" or "K" (kilobyte, 1024) "M" (megabyte, 1024k) "G"
 (gigabyte, 1024M) and T (terabyte, 1024G) are supported.
 '''))
-register(config.Option(
-        'vm.cpus', default='1',
-        help="The number of cpus."
-        ))
-register(config.Option(
-        'vm.cpu_model', default=None, invalid='error',
-        help="The number of cpus."))
-register(config.Option(
-        'vm.network', default='network=default', invalid='error',
-        help="""The --network parameter for virt-install.
+register(config.Option('vm.cpus', default='1', help='''The number of cpus.'''))
+register(config.Option('vm.cpu_model', default=None, invalid='error',
+                       help='''The number of cpus.'''))
+register(config.Option('vm.network', default='network=default',
+                       invalid='error', help='''\
+The --network parameter for virt-install.
 
 This can be specialized for each machine but the default should work in most
 setups. Watch for your DHCP server exhausting its address space if you create a
 lot of vms with random MAC addresses.
-"""))
+'''))
 
-register(config.Option(
-        'vm.meta_data', default='''\
+register(config.Option('vm.meta_data', default='''\
 instance-id: {vm.name}
 local-hostname: {vm.name}
 ''',
-        invalid='error',
-        help="The meta data for cloud-init to put in the seed."
-        ))
+                       invalid='error',
+                       help='''\
+The meta data for cloud-init to put in the seed.'''))
 
 # Some bits that may added to user-data but are optional
 
-register(config.ListOption(
-        'vm.packages', default=None,
-        help='''A list of package names to be installed.
-'''))
-register(config.Option(
-        'vm.apt_proxy', default=None, invalid='error',
-        help='''A local proxy for apt to avoid repeated .deb downloads.
+register(config.ListOption('vm.packages', default=None,
+                           help='''\
+A list of package names to be installed.'''))
+register(config.Option('vm.apt_proxy', default=None, invalid='error',
+                       help='''\
+A local proxy for apt to avoid repeated .deb downloads.
 
 Example:
 
   vm.apt_proxy = http://192.168.0.42:8000
-
 '''))
-register(config.ListOption(
-        'vm.apt_sources', default=None,
-        help='''A list of apt sources entries to be added to the default ones.
+register(config.ListOption('vm.apt_sources', default=None,
+                           help='''\
+A list of apt sources entries to be added to the default ones.
 
 Cloud-init already setup /etc/apt/sources.list with appropriate entries. Only
 additional entries need to be specified here.
 '''))
-register(config.ListOption(
-        'vm.ssh_authorized_keys', default=None,
-        help='A list of paths to public ssh keys to be authorized for'
-        ' the default user.'))
-register(config.ListOption(
-        'vm.ssh_keys', default=None,
-        help='''A list of paths to server ssh keys.
+register(config.ListOption('vm.ssh_authorized_keys', default=None,
+                           help='''\
+A list of paths to public ssh keys to be authorized for the default user.'''))
+register(config.ListOption('vm.ssh_keys', default=None,
+                           help='''A list of paths to server ssh keys.
 
 Both public and private keys can be provided. Accepted ssh key types are rsa,
 dsa and ecdsa. The file names should match <type>.*[.pub].
 '''))
-register(config.Option(
-        'vm.update', default=False,
-        from_unicode=config.bool_from_store,
-        help='''Whether or not the vm should be updated.
+register(config.Option('vm.update', default=False,
+                       from_unicode=config.bool_from_store,
+                       help='''Whether or not the vm should be updated.
+
 Both apt-get update and apt-get upgrade are called if this option is set.
 '''))
-register(config.Option(
-        'vm.password', default='ubuntu', invalid='error',
-        help="The ubuntu user password."
-        ))
-register(config.Option(
-        'vm.launchpad_id',
-        help="The launchpad login used for launchpad ssh access from the guest."
-        ))
+register(config.Option('vm.password', default='ubuntu', invalid='error',
+                       help='''The ubuntu user password.'''))
+register(config.Option('vm.launchpad_id',
+                       help='''\
+The launchpad login used for launchpad ssh access from the guest.'''))
 # The scripts that are executed before powering off
-register(PathOption(
-        'vm.root_script', default=None,
-        help='''The path to a script executed as root before powering off.
+register(PathOption('vm.root_script', default=None,
+                    help='''\
+The path to a script executed as root before powering off.
 
 This script is executed before {vm.ubuntu_script}.
-'''
-        ))
-register(PathOption(
-        'vm.ubuntu_script', default=None,
-        help='''The path to a script executed as ubuntu before powering off.
+'''))
+register(PathOption('vm.ubuntu_script', default=None,
+                    help='''\
+The path to a script executed as ubuntu before powering off.
 
 This script is excuted after {vm.root_script}.
 '''))
-register(config.ListOption(
-        'vm.uploaded_scripts', default=None,
-        help='''A list of scripts to be uploaded to the guest.
+register(config.ListOption('vm.uploaded_scripts', default=None,
+                           help='''\
+A list of scripts to be uploaded to the guest.
 
 Scripts can use config options from their vm, they will be expanded before
 upload. All scripts are uploaded into {vm.uploaded_scripts.guest_dir} under
 their base name.
 '''))
-register(config.Option(
-        'vm.uploaded_scripts.guest_dir', default='~ubuntu/bin',
-        help='''Where {vm.uploaded_scripts} are uploaded on the guest.'''
-        ))
+register(config.Option('vm.uploaded_scripts.guest_dir',
+                       default='~ubuntu/bin',
+                       help='''\
+Where {vm.uploaded_scripts} are uploaded on the guest.'''))
 
 
 class SetupVmError(Exception):
@@ -363,6 +325,7 @@
         super(CommandError, self).__init__(joined_cmd=' '.join(cmd),
                                            retcode=retcode, err=err, out=out)
 
+
 class ConfigValueError(SetupVmError):
 
     msg = 'Bad value "{value}" for option "{name}".'
@@ -395,6 +358,7 @@
                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     return proc
 
+
 def ssh_infos_from_path(key_path):
     """Analyze path to find ssh key type and kind.
 
@@ -443,7 +407,6 @@
         super(ConsoleMonitor, self).__init__()
         self.stream = stream
 
-
     def parse(self):
         while True:
             line = self.stream.readline()
@@ -614,9 +577,9 @@
         # FIXME: This may be worth fixing if we provide a more generic way to
         # create a remote tree. -- vila 2013-03-10
         hook_content = '''#!/bin/sh
-cat >{__guest_path} <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >{__guest_path} <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 {__fcontent}
-EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown {__user}:{__user} {__guest_path}
 chmod {__mode} {__guest_path}
 '''
@@ -676,9 +639,9 @@
 chmod {dir_mode} ~ubuntu
 chown {user}:{user} {dir_path}
 chmod {dir_mode} {dir_path}
-cat >{guest_path} <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >{guest_path} <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 {fcontent}
-EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown {user}:{user} {guest_path}
 chmod {file_mode} {guest_path}
 '''
@@ -698,7 +661,7 @@
         bindir = self.conf.get('vm.uploaded_scripts.guest_dir')
         out = StringIO()
         out.write('''#!/bin/sh
-cat >{hook_path} <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >{hook_path} <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 mkdir -p {bindir}
 cd {bindir}
 '''.format(**locals()))
@@ -713,10 +676,10 @@
 chmod 0755 {base}
 '''.format(**locals()))
 
-        out.write('''EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+        out.write('''EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown {user}:{user} {hook_path}
 chmod 0700 {hook_path}
-'''.format(user='ubuntu',**locals()))
+'''.format(user='ubuntu', **locals()))
         self.uploaded_scripts_hook = out.getvalue()
         self.append_cmd(['su', '-l', '-c', hook_path, 'ubuntu'])
 
@@ -763,7 +726,7 @@
 
     def add_boot_hook(self, parts, hook):
         if hook is not None:
-            parts.append({'content': '#cloud-boothook\n' +  hook})
+            parts.append({'content': '#cloud-boothook\n' + hook})
 
     def dump(self):
         parts = [{'content': '#cloud-config\n'
@@ -818,8 +781,8 @@
 
     def _ssh_keygen(self, key_path):
         ssh_type, kind = ssh_infos_from_path(key_path)
-        path = os.path.expanduser(key_path) # Just in case
-        if kind == 'private': # public will be generated at the same time
+        path = os.path.expanduser(key_path)  # Just in case
+        if kind == 'private':  # public will be generated at the same time
             run_subprocess(
                 ['ssh-keygen', '-f', path, '-N', '', '-t', ssh_type,
                  '-C', self.conf.get('vm.name')])
@@ -871,7 +834,7 @@
             # FIXME: We do ask for a progress bar but it's not displayed
             # (run_subprocess capture both stdout and stderr) ! At least while
             # used interactively, it should. -- vila 2013-02-06
-            run_subprocess(['sudo', 'wget', '--progress=dot:mega','-O',
+            run_subprocess(['sudo', 'wget', '--progress=dot:mega', '-O',
                             target, source])
             return True
         else:
@@ -935,9 +898,9 @@
         raise NotImplementedError(self.create_disk_image)
 
     def _wait_for_install_with_seed(self):
-        # The console is created by virt-install which requires sudo but creates
-        # the file 0600 for libvirt-qemu. We give read access to all otherwise
-        # 'tail -f' requires sudo and can't be killed anymore.
+        # The console is created by virt-install which requires sudo but
+        # creates the file 0600 for libvirt-qemu. We give read access to all
+        # otherwise 'tail -f' requires sudo and can't be killed anymore.
         run_subprocess(['sudo', 'chmod', '0644', self._console_path])
         # While `virt-install` is running, let's connect to the console
         console = FileMonitor(self._console_path)
@@ -947,7 +910,7 @@
 # env var OR cmdline parameter ? -- vila 2013-02-11
 #                print "read: [%s]" % (line,) # so useful for debug...
                 pass
-        except (ConsoleEOFError, CloudInitError), e:
+        except (ConsoleEOFError, CloudInitError):
             # FIXME: No test covers this path -- vila 2013-02-15
             err_lines = ['Suspicious line from cloud-init.\n',
                          '\t' + console.lines[-1],
@@ -964,11 +927,11 @@
 
     def install(self):
         # Create a kvm, relying on cloud-init to customize the base image.
-        #  
+        #
         # There are two processes involvded here:
         # - virt-install creates the vm and boots it.
         # - progress is monitored via the console to detect cloud-final.
-        #  
+        #
         # Once cloud-init has finished, the vm can be powered off.
 
         # FIXME: If the install doesn't finish after $time, emit a warning and
@@ -1133,9 +1096,9 @@
             sys.stderr = err_orig
 
 
-
 arg_parser = ArgParser()
 
+
 class Command(object):
 
     def __init__(self, vm):

=== modified file 'setup_vm/tests/__init__.py'
--- setup_vm/tests/__init__.py	2013-08-08 07:55:06 +0000
+++ setup_vm/tests/__init__.py	2013-08-08 16:32:55 +0000
@@ -1,3 +1,4 @@
+import errno
 import os
 import shutil
 import subprocess
@@ -33,8 +34,8 @@
 
     :param name: The environment variable name.
 
-    :param new: The value to set the variable to. If None, the 
-        variable is deleted from the environment.
+    :param new: The value to set the variable to. If None, the variable is
+        deleted from the environment.
 
     :returns: The actual variable value.
     """
@@ -147,7 +148,8 @@
     """
 
     def _probe(self):
-        return os.path.exists(os.path.expanduser('~/.sudo_as_admin_successful'))
+        path = os.path.expanduser('~/.sudo_as_admin_successful')
+        return os.path.exists(path)
 
     def feature_name(self):
         return 'sudo access'

=== added file 'setup_vm/tests/test_code_conformance.py'
--- setup_vm/tests/test_code_conformance.py	1970-01-01 00:00:00 +0000
+++ setup_vm/tests/test_code_conformance.py	2013-08-08 16:32:55 +0000
@@ -0,0 +1,30 @@
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import setup_vm
+
+from u1testutils.static import (
+    test_pep8_conformance as pep8,
+    test_pyflakes_analysis as pyflakes,
+)
+
+
+class Pep8ConformanceTestCase(pep8.Pep8ConformanceTestCase):
+
+    packages = [setup_vm]
+
+
+class PyflakesAnalysisTestCase(pyflakes.PyflakesAnalysisTestCase):
+
+    packages = [setup_vm]

=== modified file 'setup_vm/tests/test_setup_vm.py'
--- setup_vm/tests/test_setup_vm.py	2013-08-08 07:55:06 +0000
+++ setup_vm/tests/test_setup_vm.py	2013-08-08 16:32:55 +0000
@@ -77,11 +77,9 @@
         super(TestVmStores, self).setUp()
         self.conf = sm.VmStack('foo')
 
-
     def test_default_in_empty_stack(self):
         self.assertEqual('1024', self.conf.get('vm.ram_size'))
 
-
     def test_system_overrides_internal(self):
         self.conf.system_store._load_from_string('vm.ram_size = 42')
         self.assertEqual('42', self.conf.get('vm.ram_size'))
@@ -113,10 +111,10 @@
 
     def test_raring_iso_url(self):
         self.assertValue('http://cdimage.ubuntu.com/daily-live/current/',
-                         'vm.iso_url' )
+                         'vm.iso_url')
 
     def test_raring_iso_name(self):
-        self.assertValue( 'raring-desktop-amd64.iso', 'vm.iso_name')
+        self.assertValue('raring-desktop-amd64.iso', 'vm.iso_name')
 
     def test_raring_cloud_image_url(self):
         self.assertValue('http://cloud-images.ubuntu.com/raring/current/',
@@ -256,7 +254,8 @@
         return sm.yaml.safe_dump(*args, **kwargs)
 
     def test_load_scalar(self):
-        self.assertEqual({'foo': 'bar'}, self.yaml_load(StringIO('{foo: bar}')))
+        self.assertEqual(
+            {'foo': 'bar'}, self.yaml_load(StringIO('{foo: bar}')))
         # Surprisingly the enclosing braces are not needed, probably a special
         # case for the highest level
         self.assertEqual({'foo': 'bar'}, self.yaml_load(StringIO('foo: bar')))
@@ -276,19 +275,19 @@
 
     def test_dump_list(self):
         # No more enclosing braces... yeah for consistency :-/
-        self.assertEqual('foo: [a, b, c]\n',
-                         self.yaml_dump(dict(foo=['a', 'b', 'c'])))
+        self.assertEqual(
+            'foo: [a, b, c]\n', self.yaml_dump(dict(foo=['a', 'b', 'c'])))
 
     def test_load_dict(self):
         self.assertEqual({'foo': {'bar': 'baz'}},
-                          self.yaml_load(StringIO('{foo: {bar: baz}}')))
+                         self.yaml_load(StringIO('{foo: {bar: baz}}')))
         multiple_lines = '''\
 foo: {bar: multiple
   lines}
 '''
-        self.assertEqual({'foo': {'bar': 'multiple lines'}},
-                          self.yaml_load(StringIO(multiple_lines)))
-
+        self.assertEqual(
+            {'foo': {'bar': 'multiple lines'}},
+            self.yaml_load(StringIO(multiple_lines)))
 
 
 class TestLaunchpadAccess(TestCaseWithHome):
@@ -305,8 +304,8 @@
                               self.ci_data.set_launchpad_access)
         key_path = '~/.ssh/I-dont-exist@setup_vm'
         self.assertEqual(key_path, e.path)
-        self.assertTrue(unicode(e).startswith(
-                'You need to create the {p} keypair'.format(p=key_path)))
+        msg_prefix = 'You need to create the {p} keypair'.format(p=key_path)
+        self.assertTrue(unicode(e).startswith(msg_prefix))
 
     def test_id_with_key(self):
         ssh_dir = os.path.join(self.home_dir, '.ssh')
@@ -324,9 +323,9 @@
 chmod 0700 ~ubuntu
 chown ubuntu:ubuntu /home/ubuntu/.ssh
 chmod 0700 /home/ubuntu/.ssh
-cat >/home/ubuntu/.ssh/id_rsa <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >/home/ubuntu/.ssh/id_rsa <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 key content
-EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown ubuntu:ubuntu /home/ubuntu/.ssh/id_rsa
 chmod 0400 /home/ubuntu/.ssh/id_rsa
 ''',
@@ -388,8 +387,8 @@
     def test_poweroff_other(self):
         self.conf.store._load_from_string('vm.release = raring')
         self.ci_data.populate()
-        self.assertEqual({'mode': 'poweroff'},
-                          self.ci_data.cloud_config['power_state'])
+        self.assertEqual(
+            {'mode': 'poweroff'}, self.ci_data.cloud_config['power_state'])
         self.assertIs(None, self.ci_data.cloud_config.get('runcmd'))
 
     def test_update_true(self):
@@ -420,7 +419,7 @@
             [{'source': 'deb http://archive.ubuntu.com/ubuntu raring partner'},
              {'source': 'deb http://archive.ubuntu.com/ubuntu raring main'},
              {'source':
-                  'deb https://u:[e-mail]/user/ppa/ubuntu raring main',
+              'deb https://u:[e-mail]/user/ppa/ubuntu raring main',
               'keyid': 'ABCDEF'}],
             self.ci_data.cloud_config['apt_sources'])
 
@@ -492,7 +491,7 @@
         self.conf.store._load_from_string(
             '''vm.uploaded_scripts = I-dont-exist ''')
         self.assertRaises(sm.ConfigPathNotFound,
-                              self.ci_data.populate)
+                          self.ci_data.populate)
 
     def test_root_script(self):
         with open('root_script.sh', 'w') as f:
@@ -507,11 +506,11 @@
         # The additional newline after the script is expected
         self.assertEqual('''\
 #!/bin/sh
-cat >~root/setup_vm_post_install <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >~root/setup_vm_post_install <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 #!/bin/sh
 echo Hello root
 
-EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown root:root ~root/setup_vm_post_install
 chmod 0700 ~root/setup_vm_post_install
 ''', self.ci_data.root_hook)
@@ -531,11 +530,11 @@
         # The additional newline after the script is expected
         self.assertEqual('''\
 #!/bin/sh
-cat >~ubuntu/setup_vm_post_install <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >~ubuntu/setup_vm_post_install <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 #!/bin/sh
 echo Hello ubuntu
 
-EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown ubuntu:ubuntu ~ubuntu/setup_vm_post_install
 chmod 0700 ~ubuntu/setup_vm_post_install
 ''', self.ci_data.ubuntu_hook)
@@ -555,7 +554,7 @@
         self.ci_data.populate()
         self.assertEqual('''\
 #!/bin/sh
-cat >~ubuntu/setup_vm_uploads <<'EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN'
+cat >~ubuntu/setup_vm_uploads <<'EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN'
 mkdir -p ~ubuntu/bin
 cd ~ubuntu/bin
 cat >foo <<'EOFfoo'
@@ -570,7 +569,7 @@
 
 EOFbar
 chmod 0755 bar
-EOSETUPVMCONTENTREALLYUNIQUEDONTBREAKFORFUN
+EOSETUPVMUNIQUECONTENTDONTBREAKFORFUN
 chown ubuntu:ubuntu ~ubuntu/setup_vm_uploads
 chmod 0700 ~ubuntu/setup_vm_uploads
 ''',
@@ -717,7 +716,7 @@
         self.assertEqual(expected, sm.vm_states(lines))
 
     def test_empty(self):
-        self.assertStates({},[])
+        self.assertStates({}, [])
 
     def test_garbage(self):
         self.assertRaises(ValueError, self.assertStates, None, [''])
@@ -941,10 +940,11 @@
         self.assertTrue(os.path.exists(public_path))
         public = file(public_path).read()
         private = file(private_path).read()
-        self.assertTrue(private.startswith(
-                '-----BEGIN %s PRIVATE KEY-----\n' % (upper_type,)))
-        self.assertTrue(private.endswith(
-                '-----END %s PRIVATE KEY-----\n' % (upper_type,)))
+        self.assertTrue(
+            private.startswith('-----BEGIN %s PRIVATE KEY-----\n'
+                               % (upper_type,)))
+        self.assertTrue(
+            private.endswith('-----END %s PRIVATE KEY-----\n' % (upper_type,)))
         return private, public
 
     def test_dsa(self):
@@ -990,6 +990,7 @@
         self.assertFalse(ns.install)
         self.assertTrue(ns.download)
 
+
 class TestBuildCommands(testtools.TestCase):
 
     def setUp(self):
@@ -1061,7 +1062,6 @@
             def install(self):
                 self.install_called = True
 
-
         self.vm = FakeKvm(self.conf)
         cmd = sm.Install(self.vm)
         cmd.run()

=== modified file 'setup_vm/tests/test_test.py'
--- setup_vm/tests/test_test.py	2013-08-05 13:27:56 +0000
+++ setup_vm/tests/test_test.py	2013-08-08 16:32:55 +0000
@@ -16,13 +16,12 @@
 
 class TestEnv(testtools.TestCase):
 
-
     def test_env_preserved(self):
         os.environ['NOBODY_USES_THIS'] = 'foo'
 
         class Inner(testtools.TestCase):
 
-            def  test_overridden(self):
+            def test_overridden(self):
                 tests.isolate_env(self, {'NOBODY_USES_THIS': 'bar'})
                 self.assertEqual('bar', os.environ['NOBODY_USES_THIS'])
 
@@ -34,7 +33,7 @@
 
         class Inner(testtools.TestCase):
 
-            def  test_deleted(self):
+            def test_deleted(self):
                 tests.isolate_env(self, {'NOBODY_USES_THIS': None})
                 self.assertIs('deleted',
                               os.environ.get('NOBODY_USES_THIS', 'deleted'))

=== modified file 'u1testutils/static/__init__.py'
--- u1testutils/static/__init__.py	2012-12-03 17:52:45 +0000
+++ u1testutils/static/__init__.py	2013-08-08 16:32:55 +0000
@@ -0,0 +1,6 @@
+# No tests to load here
+
+from sst import loaders
+
+
+discover = loaders.discoverNoTests

=== modified file 'u1testutils/static/test_pep8_conformance.py'
--- u1testutils/static/test_pep8_conformance.py	2013-04-24 13:06:11 +0000
+++ u1testutils/static/test_pep8_conformance.py	2013-08-08 16:32:55 +0000
@@ -26,6 +26,7 @@
     exclude = []
 
     def setUp(self):
+        super(Pep8ConformanceTestCase, self).setUp()
         self.pep8style = pep8.StyleGuide(
             counters=defaultdict(int),
             doctest='',
@@ -44,6 +45,8 @@
         )
 
     def test_pep8_conformance(self):
+        self.assertNotEqual([], self.packages,
+                            'You should define some packages to check')
         for package in self.packages:
             self.pep8style.input_dir(os.path.dirname(package.__file__))
         self.assertEqual(self.pep8style.options.report.total_errors, 0)

=== modified file 'u1testutils/static/test_pyflakes_analysis.py'
--- u1testutils/static/test_pyflakes_analysis.py	2012-12-04 20:05:13 +0000
+++ u1testutils/static/test_pyflakes_analysis.py	2013-08-08 16:32:55 +0000
@@ -28,6 +28,8 @@
     exclude_file = None
 
     def test_pyflakes_analysis(self):
+        self.assertNotEqual([], self.packages,
+                            'You should define some packages to check')
         string_out = cStringIO.StringIO()
         with patch('sys.stdout', string_out):
             for package in self.packages: