Merge lp:~nuclearbob/utah/various-fixes into lp:utah

[Max Brustkern]

This branch adds an init file to the tests directory so we can import tests.common so the server self tests can pass. I wonder if these tests should be in a different place at some point?

Also, I fixed a bunch of static analysis errors. Docstrings for many new tests were not imperative, so I tried to make them consistent since pep257 complained about some of them.

The last change adds a git config command to set the email address so that the git test can run on a system where the user has never configured their email address.

[Javier Collado (javier.collado)]

The test/__init__.py file was already added in the past:
https://code.launchpad.net/~doanac/utah/server-cleanups/+merge/159705

but it breaks packaging because the test files are included in multiple binary packages. I guess that one of this should fix the problem:
- an update to debian/*.install files
- an updated to setup.py to exclude the test package

review: Needs Fixing

[lp:~nuclearbob/utah/various-fixes]

881. By Javier Collado on 2013-05-01

Merged changes to consolidate scripts functionality

Source branch: lp:~nuclearbob/utah/consolidate-scripts

882. By Javier Collado on 2013-05-01

Updated version number to upload to PPA

886. By Max Brustkern on 2013-05-01

Moved to using explicit package selection

887. By Max Brustkern on 2013-05-01

Collapsed vm directory into a single file

888. By Max Brustkern on 2013-05-02

Collapsed inventory directory into one file

[Max Brustkern (nuclearbob)]

I changed setup.py to explicitly define the packages used. I also eliminated the utah.provisioning.vm and utah.provisioning.inventory packages.

review: Needs Resubmitting

[lp:~nuclearbob/utah/various-fixes]

889. By Max Brustkern on 2013-05-02

Removed distribute

[Javier Collado (javier.collado)]

Looks good. Thanks.

I tested the changes and they worked fine using a saucy desktop i386 image. In my test I also removed the utah client deb, since that is no longer needed. I'll take care of that when the changes are merged (once the new release has been created).

review: Approve

[Javier Collado (javier.collado)]

Merged. Thanks for the update in the test cases docstrings by the way.

=== removed file 'distribute-0.6.25-py2.7.egg'
Binary files distribute-0.6.25-py2.7.egg	2012-06-01 22:04:50 +0000 and distribute-0.6.25-py2.7.egg	1970-01-01 00:00:00 +0000 differ
=== removed file 'distribute-0.6.25.tar.gz'
Binary files distribute-0.6.25.tar.gz	2012-04-12 15:36:27 +0000 and distribute-0.6.25.tar.gz	1970-01-01 00:00:00 +0000 differ
=== removed file 'distribute_setup.py'
--- distribute_setup.py	2012-12-05 12:08:46 +0000
+++ distribute_setup.py	1970-01-01 00:00:00 +0000
@@ -1,485 +0,0 @@
-#!python
-# flake8: noqa
-
-"""
-Bootstrap distribute installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from distribute_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import os
-import sys
-import time
-import fnmatch
-import tempfile
-import tarfile
-from distutils import log
-
-try:
-    from site import USER_SITE
-except ImportError:
-    USER_SITE = None
-
-try:
-    import subprocess
-
-    def _python_cmd(*args):
-        args = (sys.executable,) + args
-        return subprocess.call(args) == 0
-
-except ImportError:
-    # will be used for python 2.3
-    def _python_cmd(*args):
-        args = (sys.executable,) + args
-        # quoting arguments if windows
-        if sys.platform == 'win32':
-            def quote(arg):
-                if ' ' in arg:
-                    return '"%s"' % arg
-                return arg
-            args = [quote(arg) for arg in args]
-        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-
-DEFAULT_VERSION = "0.6.25"
-DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
-SETUPTOOLS_FAKED_VERSION = "0.6c11"
-
-SETUPTOOLS_PKG_INFO = """\
-Metadata-Version: 1.0
-Name: setuptools
-Version: %s
-Summary: xxxx
-Home-page: xxx
-Author: xxx
-Author-email: xxx
-License: xxx
-Description: xxx
-""" % SETUPTOOLS_FAKED_VERSION
-
-
-def _install(tarball, install_args=()):
-    # extracting the tarball
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        _extractall(tar)
-        tar.close()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
-
-        # installing
-        log.warn('Installing Distribute')
-        if not _python_cmd('setup.py', 'install', *install_args):
-            log.warn('Something went wrong during the installation.')
-            log.warn('See the error message above.')
-    finally:
-        os.chdir(old_wd)
-
-
-def _build_egg(egg, tarball, to_dir):
-    # extracting the tarball
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        _extractall(tar)
-        tar.close()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
-
-        # building an egg
-        log.warn('Building a Distribute egg in %s', to_dir)
-        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
-
-    finally:
-        os.chdir(old_wd)
-    # returning the result
-    log.warn(egg)
-    if not os.path.exists(egg):
-        raise IOError('Could not build the egg.')
-
-
-def _do_download(version, download_base, to_dir, download_delay):
-    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
-                       % (version, sys.version_info[0], sys.version_info[1]))
-    if not os.path.exists(egg):
-        tarball = download_setuptools(version, download_base,
-                                      to_dir, download_delay)
-        _build_egg(egg, tarball, to_dir)
-    sys.path.insert(0, egg)
-    import setuptools
-    setuptools.bootstrap_install_from = egg
-
-
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15, no_fake=True):
-    # making sure we use the absolute path
-    to_dir = os.path.abspath(to_dir)
-    was_imported = 'pkg_resources' in sys.modules or \
-        'setuptools' in sys.modules
-    try:
-        try:
-            import pkg_resources
-            if not hasattr(pkg_resources, '_distribute'):
-                if not no_fake:
-                    _fake_setuptools()
-                raise ImportError
-        except ImportError:
-            return _do_download(version, download_base, to_dir, download_delay)
-        try:
-            pkg_resources.require("distribute>="+version)
-            return
-        except pkg_resources.VersionConflict:
-            e = sys.exc_info()[1]
-            if was_imported:
-                sys.stderr.write(
-                "The required version of distribute (>=%s) is not available,\n"
-                "and can't be installed while this script is running. Please\n"
-                "install a more recent version first, using\n"
-                "'easy_install -U distribute'."
-                "\n\n(Currently using %r)\n" % (version, e.args[0]))
-                sys.exit(2)
-            else:
-                del pkg_resources, sys.modules['pkg_resources']    # reload ok
-                return _do_download(version, download_base, to_dir,
-                                    download_delay)
-        except pkg_resources.DistributionNotFound:
-            return _do_download(version, download_base, to_dir,
-                                download_delay)
-    finally:
-        if not no_fake:
-            _create_fake_setuptools_pkg_info(to_dir)
-
-def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                        to_dir=os.curdir, delay=15):
-    """Download distribute from a specified location and return its filename
-
-    `version` should be a valid distribute version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download
-    attempt.
-    """
-    # making sure we use the absolute path
-    to_dir = os.path.abspath(to_dir)
-    try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
-    tgz_name = "distribute-%s.tar.gz" % version
-    url = download_base + tgz_name
-    saveto = os.path.join(to_dir, tgz_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            log.warn("Downloading %s", url)
-            src = urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = src.read()
-            dst = open(saveto, "wb")
-            dst.write(data)
-        finally:
-            if src:
-                src.close()
-            if dst:
-                dst.close()
-    return os.path.realpath(saveto)
-
-def _no_sandbox(function):
-    def __no_sandbox(*args, **kw):
-        try:
-            from setuptools.sandbox import DirectorySandbox
-            if not hasattr(DirectorySandbox, '_old'):
-                def violation(*args):
-                    pass
-                DirectorySandbox._old = DirectorySandbox._violation
-                DirectorySandbox._violation = violation
-                patched = True
-            else:
-                patched = False
-        except ImportError:
-            patched = False
-
-        try:
-            return function(*args, **kw)
-        finally:
-            if patched:
-                DirectorySandbox._violation = DirectorySandbox._old
-                del DirectorySandbox._old
-
-    return __no_sandbox
-
-def _patch_file(path, content):
-    """Will backup the file then patch it"""
-    existing_content = open(path).read()
-    if existing_content == content:
-        # already patched
-        log.warn('Already patched.')
-        return False
-    log.warn('Patching...')
-    _rename_path(path)
-    with open(path, 'w') as f:
-        f.write(content)
-    return True
-
-_patch_file = _no_sandbox(_patch_file)
-
-def _same_content(path, content):
-    return open(path).read() == content
-
-def _rename_path(path):
-    new_name = path + '.OLD.%s' % time.time()
-    log.warn('Renaming %s into %s', path, new_name)
-    os.rename(path, new_name)
-    return new_name
-
-def _remove_flat_installation(placeholder):
-    if not os.path.isdir(placeholder):
-        log.warn('Unkown installation at %s', placeholder)
-        return False
-    found = False
-    for file in os.listdir(placeholder):
-        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
-            found = True
-            break
-    if not found:
-        log.warn('Could not locate setuptools*.egg-info')
-        return
-
-    log.warn('Removing elements out of the way...')
-    pkg_info = os.path.join(placeholder, file)
-    if os.path.isdir(pkg_info):
-        patched = _patch_egg_dir(pkg_info)
-    else:
-        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
-
-    if not patched:
-        log.warn('%s already patched.', pkg_info)
-        return False
-    # now let's move the files out of the way
-    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
-        element = os.path.join(placeholder, element)
-        if os.path.exists(element):
-            _rename_path(element)
-        else:
-            log.warn('Could not find the %s element of the '
-                     'Setuptools distribution', element)
-    return True
-
-_remove_flat_installation = _no_sandbox(_remove_flat_installation)
-
-def _after_install(dist):
-    log.warn('After install bootstrap.')
-    placeholder = dist.get_command_obj('install').install_purelib
-    _create_fake_setuptools_pkg_info(placeholder)
-
-def _create_fake_setuptools_pkg_info(placeholder):
-    if not placeholder or not os.path.exists(placeholder):
-        log.warn('Could not find the install location')
-        return
-    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
-            (SETUPTOOLS_FAKED_VERSION, pyver)
-    pkg_info = os.path.join(placeholder, setuptools_file)
-    if os.path.exists(pkg_info):
-        log.warn('%s already exists', pkg_info)
-        return
-
-    log.warn('Creating %s', pkg_info)
-    with open(pkg_info, 'w') as f:
-        f.write(SETUPTOOLS_PKG_INFO)
-
-    pth_file = os.path.join(placeholder, 'setuptools.pth')
-    log.warn('Creating %s', pth_file)
-    with open(pth_file, 'w') as f:
-        f.write(os.path.join(os.curdir, setuptools_file))
-
-_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
-
-def _patch_egg_dir(path):
-    # let's check if it's already patched
-    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
-    if os.path.exists(pkg_info):
-        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
-            log.warn('%s already patched.', pkg_info)
-            return False
-    _rename_path(path)
-    os.mkdir(path)
-    os.mkdir(os.path.join(path, 'EGG-INFO'))
-    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
-    with open(pkg_info, 'w') as f:
-        f.write(SETUPTOOLS_PKG_INFO)
-    return True
-
-_patch_egg_dir = _no_sandbox(_patch_egg_dir)
-
-def _before_install():
-    log.warn('Before install bootstrap.')
-    _fake_setuptools()
-
-
-def _under_prefix(location):
-    if 'install' not in sys.argv:
-        return True
-    args = sys.argv[sys.argv.index('install')+1:]
-    for index, arg in enumerate(args):
-        for option in ('--root', '--prefix'):
-            if arg.startswith('%s=' % option):
-                top_dir = arg.split('root=')[-1]
-                return location.startswith(top_dir)
-            elif arg == option:
-                if len(args) > index:
-                    top_dir = args[index+1]
-                    return location.startswith(top_dir)
-        if arg == '--user' and USER_SITE is not None:
-            return location.startswith(USER_SITE)
-    return True
-
-
-def _fake_setuptools():
-    log.warn('Scanning installed packages')
-    try:
-        import pkg_resources
-    except ImportError:
-        # we're cool
-        log.warn('Setuptools or Distribute does not seem to be installed.')
-        return
-    ws = pkg_resources.working_set
-    try:
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
-                                  replacement=False))
-    except TypeError:
-        # old distribute API
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
-
-    if setuptools_dist is None:
-        log.warn('No setuptools distribution found')
-        return
-    # detecting if it was already faked
-    setuptools_location = setuptools_dist.location
-    log.warn('Setuptools installation detected at %s', setuptools_location)
-
-    # if --root or --preix was provided, and if
-    # setuptools is not located in them, we don't patch it
-    if not _under_prefix(setuptools_location):
-        log.warn('Not patching, --root or --prefix is installing Distribute'
-                 ' in another location')
-        return
-
-    # let's see if its an egg
-    if not setuptools_location.endswith('.egg'):
-        log.warn('Non-egg installation')
-        res = _remove_flat_installation(setuptools_location)
-        if not res:
-            return
-    else:
-        log.warn('Egg installation')
-        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
-        if (os.path.exists(pkg_info) and
-            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
-            log.warn('Already patched.')
-            return
-        log.warn('Patching...')
-        # let's create a fake egg replacing setuptools one
-        res = _patch_egg_dir(setuptools_location)
-        if not res:
-            return
-    log.warn('Patched done.')
-    _relaunch()
-
-
-def _relaunch():
-    log.warn('Relaunching...')
-    # we have to relaunch the process
-    # pip marker to avoid a relaunch bug
-    if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
-        sys.argv[0] = 'setup.py'
-    args = [sys.executable] + sys.argv
-    sys.exit(subprocess.call(args))
-
-
-def _extractall(self, path=".", members=None):
-    """Extract all members from the archive to the current working
-       directory and set owner, modification time and permissions on
-       directories afterwards. `path' specifies a different directory
-       to extract to. `members' is optional and must be a subset of the
-       list returned by getmembers().
-    """
-    import copy
-    import operator
-    from tarfile import ExtractError
-    directories = []
-
-    if members is None:
-        members = self
-
-    for tarinfo in members:
-        if tarinfo.isdir():
-            # Extract directories with a safe mode.
-            directories.append(tarinfo)
-            tarinfo = copy.copy(tarinfo)
-            tarinfo.mode = 448 # decimal for oct 0700
-        self.extract(tarinfo, path)
-
-    # Reverse sort directories.
-    if sys.version_info < (2, 4):
-        def sorter(dir1, dir2):
-            return cmp(dir1.name, dir2.name)
-        directories.sort(sorter)
-        directories.reverse()
-    else:
-        directories.sort(key=operator.attrgetter('name'), reverse=True)
-
-    # Set correct owner, mtime and filemode on directories.
-    for tarinfo in directories:
-        dirpath = os.path.join(path, tarinfo.name)
-        try:
-            self.chown(tarinfo, dirpath)
-            self.utime(tarinfo, dirpath)
-            self.chmod(tarinfo, dirpath)
-        except ExtractError:
-            e = sys.exc_info()[1]
-            if self.errorlevel > 1:
-                raise
-            else:
-                self._dbg(1, "tarfile: %s" % e)
-
-def _build_install_args(argv):
-    install_args = []
-    user_install = '--user' in argv
-    if user_install and sys.version_info < (2,6):
-        log.warn("--user requires Python 2.6 or later")
-        raise SystemExit(1)
-    if user_install:
-        install_args.append('--user')
-    return install_args
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-    tarball = download_setuptools()
-    _install(tarball, _build_install_args(argv))
-
-
-if __name__ == '__main__':
-    main(sys.argv[1:])

=== modified file 'docs/source/reference.rst'
--- docs/source/reference.rst	2013-04-24 10:32:29 +0000
+++ docs/source/reference.rst	2013-05-02 18:27:25 +0000
@@ -106,6 +106,9 @@
 .. automodule:: utah.provisioning.exceptions
    :members:
 
+.. automodule:: utah.provisioning.inventory
+   :members:
+
 .. automodule:: utah.provisioning.provisioning
    :members:
 
@@ -115,6 +118,9 @@
 .. automodule:: utah.provisioning.ssh
    :members:
 
+.. automodule:: utah.provisioning.vm
+   :members:
+
 ``utah.provisioning.baremetal``
 -------------------------------
 
@@ -131,29 +137,3 @@
 
 .. automodule:: utah.provisioning.baremetal.exceptions
    :members:
-
-``utah.provisioning.inventory``
--------------------------------
-
-.. automodule:: utah.provisioning.inventory
-
-.. automodule:: utah.provisioning.inventory.exceptions
-   :members:
-
-.. automodule:: utah.provisioning.inventory.inventory
-   :members:
-
-.. automodule:: utah.provisioning.inventory.sqlite
-   :members:
-
-``utah.provisioning.vm``
--------------------------
-
-.. automodule:: utah.provisioning.vm
-
-.. automodule:: utah.provisioning.vm.exceptions
-   :members:
-
-.. automodule:: utah.provisioning.vm.vm
-   :members:
-

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2013-05-01 18:04:36 +0000
+++ examples/run_utah_tests.py	2013-05-02 18:27:25 +0000
@@ -36,7 +36,7 @@
 from utah.provisioning.baremetal.inventory import \
     ManualBaremetalSQLiteInventory
 from utah.provisioning.ssh import ProvisionedMachine
-from utah.provisioning.vm.vm import TinySQLiteInventory
+from utah.provisioning.vm import TinySQLiteInventory
 from utah.run import (
     configure_logging,
     master_runlist_argument,

=== modified file 'setup.py'
--- setup.py	2013-04-10 20:13:44 +0000
+++ setup.py	2013-05-02 18:27:25 +0000
@@ -18,13 +18,12 @@
 """Provide installation information for setuptools."""
 
 
-import distribute_setup
-distribute_setup.use_setuptools()
-from setuptools import setup, find_packages
-
 import os
 import re
 
+from setuptools import setup
+
+
 # look/set what version we have
 version = "0.0"
 changelog = "debian/changelog"
@@ -48,7 +47,10 @@
 setup(
     name='utah',
     version=version,
-    packages=find_packages(),
+    packages=['utah',
+              'utah.client',
+              'utah.provisioning',
+              'utah.provisioning.baremetal'],
     maintainer=maintainer,
     maintainer_email=maintainer_email,
 )

=== added file 'tests/__init__.py'
--- tests/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/__init__.py	2013-05-02 18:27:25 +0000
@@ -0,0 +1,16 @@
+# Ubuntu Testing Automation Harness
+# Copyright 2012 Canonical Ltd.
+
+# 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.
+
+# 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 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/>.
+
+"""server self tests"""

=== modified file 'tests/test_rsyslog.py'
--- tests/test_rsyslog.py	2013-04-24 11:37:21 +0000
+++ tests/test_rsyslog.py	2013-05-02 18:27:25 +0000
@@ -253,7 +253,7 @@
         self.usefile(True)
 
     def test_timeout(self):
-        """UTAHTimeout is raised on timeout"""
+        """Verify UTAHTimeout is raised on timeout."""
         steps = [
             {
                 "message": "message_1",

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2013-04-25 14:12:49 +0000
+++ utah/client/common.py	2013-05-02 18:27:25 +0000
@@ -115,7 +115,7 @@
 
 # Process queue stuff inspired by:
 # http://stackoverflow.com/a/4896288
-def enqueue_output(out, queue):
+def _enqueue_output(out, queue):
     for line in iter(out.readline, b''):
         queue.put(line)
     out.close()
@@ -195,10 +195,10 @@
         signal.signal(signal.SIGALRM, alarm_handler)
         signal.alarm(timeout)
 
-    outt = Thread(target=enqueue_output, args=(p.stdout, outq))
+    outt = Thread(target=_enqueue_output, args=(p.stdout, outq))
     outt.daemon = True
     outt.start()
-    errt = Thread(target=enqueue_output, args=(p.stderr, errq))
+    errt = Thread(target=_enqueue_output, args=(p.stderr, errq))
     errt.daemon = True
     errt.start()
 
@@ -416,6 +416,7 @@
 
     @classmethod
     def check_schema(self, schema):
+        """Call the superclass directly since super doesn't work here."""
         jsonschema.Draft4Validator.check_schema(schema)
 
     def validate_properties(self, properties, instance, schema):

=== modified file 'utah/client/tests/test_runner.py'
--- utah/client/tests/test_runner.py	2013-05-01 17:37:58 +0000
+++ utah/client/tests/test_runner.py	2013-05-02 18:27:25 +0000
@@ -49,7 +49,7 @@
         self.result_class = ResultYAML
         self.state_file = '/tmp/state.yaml'
         self.state_agent = StateAgentYAML(state_file=self.state_file)
-        self.output_file='/tmp/utah.out'
+        self.output_file = '/tmp/utah.out'
         self.runner = Runner(install_type='desktop',
                              result_class=self.result_class,
                              state_agent=self.state_agent,
@@ -202,27 +202,36 @@
 
 
 class TestRunnerMasterRunlistSchema(unittest.TestCase):
-    """Master runlist schema test cases."""
+
+    """Provide master runlist schema test cases."""
+
     def setUp(self):
+        """Setup needed resources."""
         schema = Runner.MASTER_RUNLIST_SCHEMA
         DefaultValidator.check_schema(schema)
         self.validator = DefaultValidator(schema)
 
     def validate(self, data):
+        """Validate a schema.
+
+        :returns: validates schema
+        :rtype: object
+
+        """
         return self.validator.validate(data)
 
     def test_empty_string_invalid(self):
-        """An empty string doesn't validate."""
+        """Verify an empty string doesn't validate."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate('')
 
     def test_empty_dict_invalid(self):
-        """An empty dictionary is invalid."""
+        """Verify an empty dictionary is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({})
 
     def test_valid(self):
-        """An example of valid data."""
+        """Verify valid data works."""
         self.validate({
             'testsuites': [{
                 'name': 'name',
@@ -232,21 +241,21 @@
         })
 
     def test_testsuites_required(self):
-        """A list of test suites is required."""
+        """Verify a list of test suites is required."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'battery_measurements': True,
             })
 
     def test_testsuites_empty_invalid(self):
-        """An empty list of test suites is invalid."""
+        """Verify an empty list of test suites is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [],
             })
 
     def test_testsuite_name_required(self):
-        """Test suite name is required."""
+        """Verify test suite name is required."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -256,7 +265,7 @@
             })
 
     def test_testsuite_fetch_method_required(self):
-        """Test suite fetch method is required."""
+        """Verify test suite fetch method is required."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -266,7 +275,7 @@
             })
 
     def test_testsuite_fetch_method_known_values(self):
-        """Test suite fetch method known values are valid."""
+        """Verify test suite fetch method known values are valid."""
         testsuite = {
             'name': 'name',
             'fetch_location': 'fetch location',
@@ -279,7 +288,7 @@
             self.validate(data)
 
     def test_testsuite_fetch_method_unknown_value(self):
-        """Test suite fetch method unknown values are valid."""
+        """Verify test suite fetch method unknown values are valid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -290,7 +299,7 @@
             })
 
     def test_testsuite_fetch_location_required(self):
-        """Test suite fetch location is required."""
+        """Verify test suite fetch location is required."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -300,7 +309,7 @@
             })
 
     def test_testsuite_include_tests_empty_invalid(self):
-        """Empty list of included tests is invalid."""
+        """Verify an empty list of included tests is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -312,7 +321,7 @@
             })
 
     def test_testsuite_include_tests_string(self):
-        """List of strings as included tests is valid."""
+        """Verify a list of strings as included tests is valid."""
         self.validate({
             'testsuites': [{
                 'name': 'name',
@@ -323,7 +332,7 @@
         })
 
     def test_testsuite_exclude_tests_empty_invalid(self):
-        """Empty list of excluded tests is invalid."""
+        """Verify an empty list of excluded tests is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -335,7 +344,7 @@
             })
 
     def test_testsuite_exclude_tests_string(self):
-        """List of strings as excluded tests is valid."""
+        """Verify a list of strings as excluded tests is valid."""
         self.validate({
             'testsuites': [{
                 'name': 'name',
@@ -346,7 +355,7 @@
         })
 
     def test_battery_measurements_false_by_default(self):
-        """Battery measurements is false by default"""
+        """Verify battery measurements is false by default."""
         data = {
             'testsuites': [{
                 'name': 'name',
@@ -358,7 +367,7 @@
         self.assertFalse(data['battery_measurements'])
 
     def test_battery_measurements_string_invalid(self):
-        """A battery measurements string value is invalid"""
+        """Verify battery measurements string value is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -370,7 +379,7 @@
             })
 
     def test_battery_measurements_boolean_valid(self):
-        """A battery measurements boolean value is valid"""
+        """Verify a battery measurements boolean value is valid."""
         self.validate({
             'testsuites': [{
                 'name': 'name',
@@ -381,7 +390,7 @@
         })
 
     def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid"""
+        """Verify a zero timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -393,7 +402,7 @@
             })
 
     def test_negative_timeout_invalid(self):
-        """A negative timeout is invalid"""
+        """Verify a negative timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{
@@ -405,7 +414,7 @@
             })
 
     def test_repeat_count_zero_by_default(self):
-        """Repeat count is zero by default"""
+        """Verify repeat count is zero by default."""
         data = {
             'testsuites': [{
                 'name': 'name',
@@ -418,7 +427,7 @@
         self.assertEqual(data['repeat_count'], 0)
 
     def test_negative_repeat_count_invalid(self):
-        """A negative repeat count is invalid"""
+        """Verift. negative repeat count is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'testsuites': [{

=== modified file 'utah/client/tests/test_testcase.py'
--- utah/client/tests/test_testcase.py	2013-04-29 21:04:46 +0000
+++ utah/client/tests/test_testcase.py	2013-05-02 18:27:25 +0000
@@ -143,13 +143,22 @@
 
 
 class TestTestCaseControlSchema(unittest.TestCase):
+
     """Test case control schema test cases."""
-    def setUp(self,):
+
+    def setUp(self):
+        """Setup needed resources."""
         schema = testcase.TestCase.CONTROL_SCHEMA
         DefaultValidator.check_schema(schema)
         self.validator = DefaultValidator(schema)
 
     def validate(self, data):
+        """Validate a schema.
+
+        :returns: validates schema
+        :rtype: object
+
+        """
         schema = testcase.TestCase.CONTROL_SCHEMA
         return jsonschema.validate(data, schema)
 
@@ -164,7 +173,7 @@
             self.validate({})
 
     def test_valid(self):
-        """An example of valid data."""
+        """Verify valid data works."""
         self.validate({
             'description': 'description',
             'dependencies': 'dependencies',
@@ -175,7 +184,7 @@
         })
 
     def test_description_required(self):
-        """Description is a required property."""
+        """Verify description is a required property."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'dependencies': 'dependencies',
@@ -186,7 +195,7 @@
             })
 
     def test_dependencies_required(self):
-        """Dependencies is a required property."""
+        """Verify dependencies is a required property."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -197,7 +206,7 @@
             })
 
     def test_action_required(self):
-        """Action is a required property."""
+        """Verify action is a required property."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -208,7 +217,7 @@
             })
 
     def test_expected_results_required(self):
-        """Expected results is a required property."""
+        """Verify expected results is a required property."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -219,7 +228,7 @@
             })
 
     def test_command_required(self):
-        """Command is a required property."""
+        """Verify command is a required property."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -230,7 +239,7 @@
             })
 
     def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid"""
+        """Verify a zero timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -243,7 +252,7 @@
             })
 
     def test_negative_timeout_invalid(self):
-        """A negative timeout is invalid"""
+        """Verify a negative timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -256,7 +265,7 @@
             })
 
     def test_type_userland_valid(self):
-        """Userland type is valid."""
+        """Verify userland type is valid."""
         self.validate({
             'description': 'description',
             'dependencies': 'dependencies',
@@ -268,7 +277,7 @@
         })
 
     def test_type_unknown_invalid(self):
-        """Unknown type is valid."""
+        """Verify unknown type is valid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',
@@ -281,7 +290,7 @@
             })
 
     def test_reboot_known_valid(self):
-        """Reboot known values are valid."""
+        """Verify reboot known values are valid."""
         data = {
             'description': 'description',
             'dependencies': 'dependencies',
@@ -296,7 +305,7 @@
             self.validate(data)
 
     def test_unknown_reboot_invalid(self):
-        """Reboot unknown value is invalid."""
+        """Verify reboot unknown value is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({
                 'description': 'description',

=== modified file 'utah/client/tests/test_testsuite.py'
--- utah/client/tests/test_testsuite.py	2013-04-25 14:14:19 +0000
+++ utah/client/tests/test_testsuite.py	2013-05-02 18:27:25 +0000
@@ -163,43 +163,51 @@
 
 
 class TestTestSuiteRunlistSchema(unittest.TestCase):
+
     """Test suite run list schema test cases."""
 
     def setUp(self):
+        """Initialize basic test case data."""
         schema = testsuite.TestSuite.RUNLIST_SCHEMA
         DefaultValidator.check_schema(schema)
         self.validator = DefaultValidator(schema)
 
     def validate(self, data):
+        """Validate a schema.
+
+        :returns: validates schema
+        :rtype: object
+
+        """
         return self.validator.validate(data)
 
     def test_empty_string_invalid(self):
-        """An empty string doesn't validate."""
+        """Verify an empty string doesn't validate."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate('')
 
     def test_empty_dict_invalid(self):
-        """An empty dictionary doesn't validate."""
+        """Verify an empty dictionary doesn't validate."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate({})
 
     def test_empty_list_invalid(self):
-        """An empty list doesn't validate."""
+        """Verify an empty list doesn't validate."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate([])
 
     def test_string_list_invalid(self):
-        """A list of strings is invalid."""
+        """Verify a list of strings is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate(['a', 'b', 'c'])
 
     def test_empty_dict_list_invalid(self):
-        """A list of empty dictionaries is invalid."""
+        """Verify a list of empty dictionaries is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate([{}, {}, {}])
 
     def test_unknown_test_property_invalid(self):
-        """An unknown property in a test object invalid."""
+        """Verify an unknown property in a test object invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate(
                 [{'test': 'test name',
@@ -207,13 +215,13 @@
                   }])
 
     def test_empty_overrides_invalid(self):
-        """An empty overrides section is invalid."""
+        """Verify an empty overrides section is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate([{'test': 'test name',
                             'overrides': {}}])
 
     def test_unknown_property_in_overrides_invalid(self):
-        """An unknown property in overrides section is invalid."""
+        """Verify an unknown property in overrides section is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate(
                 [{'test': 'test name',
@@ -221,25 +229,25 @@
                   }])
 
     def test_zero_timeout_invalid(self):
-        """A zero timeout is invalid"""
+        """Verify a zero timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate([{'test': 'test name',
                             'overrides': {'timeout': 0}}])
 
     def test_negative_timeout_invalid(self):
-        """A negative timeout is invalid"""
+        """Verify a negative timeout is invalid."""
         with self.assertRaises(jsonschema.ValidationError):
             self.validate([{'test': 'test name',
                             'overrides': {'timeout': -1}}])
 
     def test_list_valid(self):
-        """A list of test cases is valid."""
+        """Verify a list of test cases is valid."""
         self.validate(
             [{'test': 'test name'},
              {'test': 'test name 2'}])
 
     def test_with_overrides_list_valid(self):
-        """A list of test case names with overrides is valid."""
+        """Verify a list of test case names with overrides is valid."""
         self.validate([
             {'test': 'test name',
              'overrides': {'timeout': 1},
@@ -251,13 +259,22 @@
 
 
 class TestTestSuiteControlSchema(unittest.TestCase):
+
     """Test suite control schema test cases."""
+
     def setUp(self):
+        """Initialize basic test case data."""
         schema = testsuite.TestSuite.CONTROL_SCHEMA
         DefaultValidator.check_schema(schema)
         self.validator = DefaultValidator(schema)
 
     def validate(self, data):
+        """Validate a schema.
+
+        :returns: validates schema
+        :rtype: object
+
+        """
         return self.validator.validate(data)
 
     def test_empty_string_invalid(self):

=== modified file 'utah/client/tests/test_vcs_git.py'
--- utah/client/tests/test_vcs_git.py	2013-04-05 19:32:58 +0000
+++ utah/client/tests/test_vcs_git.py	2013-05-02 18:27:25 +0000
@@ -33,6 +33,7 @@
     os.mkdir(GIT_TEST_REPO)
 
     run_cmd("git init", cwd=GIT_TEST_REPO)
+    run_cmd('git config user.email "[e-mail]"', cwd=GIT_TEST_REPO)
     run_cmd("touch test.py", cwd=GIT_TEST_REPO)
     run_cmd("git add test.py", cwd=GIT_TEST_REPO)
     run_cmd("git commit -m'Initial import' test.py", cwd=GIT_TEST_REPO)

=== modified file 'utah/provisioning/baremetal/inventory.py'
--- utah/provisioning/baremetal/inventory.py	2013-04-10 15:42:26 +0000
+++ utah/provisioning/baremetal/inventory.py	2013-05-02 18:27:25 +0000
@@ -21,9 +21,10 @@
 import os
 
 from utah.process import pid_in_use
-from utah.provisioning.inventory.exceptions import \
-    UTAHProvisioningInventoryException
-from utah.provisioning.inventory.sqlite import SQLiteInventory
+from utah.provisioning.inventory import (
+    UTAHProvisioningInventoryException,
+    SQLiteInventory,
+)
 
 
 class ManualBaremetalSQLiteInventory(SQLiteInventory):

=== removed directory 'utah/provisioning/inventory'
=== renamed file 'utah/provisioning/inventory/inventory.py' => 'utah/provisioning/inventory.py'
--- utah/provisioning/inventory/inventory.py	2013-04-04 15:39:49 +0000
+++ utah/provisioning/inventory.py	2013-05-02 18:27:25 +0000
@@ -16,9 +16,19 @@
 """Provide basic inventory routines."""
 
 
+import logging
 import os
-from utah.provisioning.inventory.exceptions import \
-    UTAHProvisioningInventoryException
+import sqlite3
+
+from utah import config
+from utah.provisioning.exceptions import UTAHProvisioningException
+
+
+class UTAHProvisioningInventoryException(UTAHProvisioningException):
+
+    """Provide a class for UTAH provisioning inventory exceptions."""
+
+    pass
 
 
 class Inventory(object):
@@ -107,3 +117,49 @@
 
         """
         return False
+
+
+class SQLiteInventory(Inventory):
+
+    """Provide basic SQLite database access with a cursor."""
+
+    def __init__(self, db='~/.utah-sqlite-inventory', *args, **kw):
+        db = os.path.expanduser(db)
+        super(SQLiteInventory, self).__init__(*args, uniqueid=db, **kw)
+        self.db = db
+        self._connection = sqlite3.connect(
+            self.db, config.sqlite3_db_connection_timeout)
+        self._connection.isolation_level = None
+        self._connection.row_factory = sqlite3.Row
+
+    def execute(self, sql, parameters=None):
+        """Execute SQL statement and return cursor.
+
+        This method is expected to be used as a wrapper around all
+        `connection.execute` calls so that all the SQL statements are logged in
+        case this information is needed to troubleshoot problems.
+
+        :param sql: A sql statement to be executed
+        :type sql: str
+        :param parameters:
+            Parameters to use to replace the placeholder
+            values in the sql statement.
+        :type parameters:
+            list (question mark placeholders) |
+            dict (colon named placeholders)
+        :returns: Cursor used to execute statement
+        :rtype: object
+
+        """
+        if parameters is None:
+            parameters = []
+
+        logging.debug('Executing SQL statement: {}, {}'
+                      .format(sql, parameters))
+        cursor = self._connection.execute(sql, parameters)
+        return cursor
+
+    def delete(self):
+        """Remove database."""
+        os.unlink(self.db)
+        super(SQLiteInventory, self).delete()

=== removed file 'utah/provisioning/inventory/__init__.py'
--- utah/provisioning/inventory/__init__.py	2013-04-04 13:42:40 +0000
+++ utah/provisioning/inventory/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# 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.
-
-# 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 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/>.
-
-"""utah.provisioning.inventory"""

=== removed file 'utah/provisioning/inventory/exceptions.py'
--- utah/provisioning/inventory/exceptions.py	2013-04-03 18:33:32 +0000
+++ utah/provisioning/inventory/exceptions.py	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# 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.
-
-# 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 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/>.
-
-"""Provide exceptions specific to inventory issues."""
-
-
-from utah.provisioning.exceptions import UTAHProvisioningException
-
-
-class UTAHProvisioningInventoryException(UTAHProvisioningException):
-
-    """Provide a class for UTAH provisioning inventory exceptions."""
-
-    pass

=== removed file 'utah/provisioning/inventory/sqlite.py'
--- utah/provisioning/inventory/sqlite.py	2013-04-04 14:55:25 +0000
+++ utah/provisioning/inventory/sqlite.py	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# 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.
-
-# 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 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/>.
-"""Provide base class for SQLite-based inventories."""
-
-
-import sqlite3
-import os
-import logging
-
-from utah.provisioning.inventory.inventory import Inventory
-from utah import config
-
-
-class SQLiteInventory(Inventory):
-
-    """Provide basic SQLite database access with a cursor."""
-
-    def __init__(self, db='~/.utah-sqlite-inventory', *args, **kw):
-        db = os.path.expanduser(db)
-        super(SQLiteInventory, self).__init__(*args, uniqueid=db, **kw)
-        self.db = db
-        self._connection = sqlite3.connect(
-            self.db, config.sqlite3_db_connection_timeout)
-        self._connection.isolation_level = None
-        self._connection.row_factory = sqlite3.Row
-
-    def execute(self, sql, parameters=None):
-        """Execute SQL statement and return cursor.
-
-        This method is expected to be used as a wrapper around all
-        `connection.execute` calls so that all the SQL statements are logged in
-        case this information is needed to troubleshoot problems.
-
-        :param sql: A sql statement to be executed
-        :type sql: str
-        :param parameters:
-            Parameters to use to replace the placeholder
-            values in the sql statement.
-        :type parameters:
-            list (question mark placeholders) |
-            dict (colon named placeholders)
-        :returns: Cursor used to execute statement
-        :rtype: object
-
-        """
-        if parameters is None:
-            parameters = []
-
-        logging.debug('Executing SQL statement: {}, {}'
-                      .format(sql, parameters))
-        cursor = self._connection.execute(sql, parameters)
-        return cursor
-
-    def delete(self):
-        """Remove database."""
-        os.unlink(self.db)
-        super(SQLiteInventory, self).delete()

=== removed directory 'utah/provisioning/vm'
=== renamed file 'utah/provisioning/vm/vm.py' => 'utah/provisioning/vm.py'
--- utah/provisioning/vm/vm.py	2013-04-26 17:33:15 +0000
+++ utah/provisioning/vm.py	2013-05-02 18:27:25 +0000
@@ -28,14 +28,21 @@
 
 from utah import config
 from utah.process import ProcessChecker, ProcessRunner
-from utah.provisioning.inventory.sqlite import SQLiteInventory
+from utah.provisioning.exceptions import UTAHProvisioningException
+from utah.provisioning.inventory import SQLiteInventory
 from utah.provisioning.provisioning import CustomInstallMixin, Machine
 from utah.provisioning.rsyslog import RSyslog
 from utah.provisioning.ssh import SSHMixin
-from utah.provisioning.vm.exceptions import UTAHVMProvisioningException
 from utah.timeout import UTAHTimeout
 
 
+class UTAHVMProvisioningException(UTAHProvisioningException):
+
+    """Provide a foundation class for UTAH VM provisioning exceptions."""
+
+    pass
+
+
 class LibvirtVM(Machine):
 
     """Provide a class to utilize VMs using libvirt.

=== removed file 'utah/provisioning/vm/__init__.py'
--- utah/provisioning/vm/__init__.py	2013-04-04 13:42:40 +0000
+++ utah/provisioning/vm/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# 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.
-
-# 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 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/>.
-
-"""utah.provisioning.vm"""

=== removed file 'utah/provisioning/vm/exceptions.py'
--- utah/provisioning/vm/exceptions.py	2013-04-03 17:45:59 +0000
+++ utah/provisioning/vm/exceptions.py	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# Ubuntu Testing Automation Harness
-# Copyright 2012 Canonical Ltd.
-
-# 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.
-
-# 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 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/>.
-
-"""Provide excpetions specific to virtual machines."""
-
-
-from utah.provisioning.exceptions import UTAHProvisioningException
-
-
-class UTAHVMProvisioningException(UTAHProvisioningException):
-
-    """Provide a foundation class for UTAH VM provisioning exceptions."""
-
-    pass