Merge lp:~xnox/utah/new-pep8 into lp:utah

[Dimitri John Ledkov]

New pep8 in raring is more strict about whitespace.
Here are some fixes.

[Javier Collado (javier.collado)]

Looks good to me. Also, I've run the `pass.run` runlist with a desktop i386
image and worked fine.

review: Approve

=== modified file 'examples/run_install_test.py'
--- examples/run_install_test.py	2012-12-03 15:49:35 +0000
+++ examples/run_install_test.py	2012-12-08 02:12:21 +0000
@@ -29,15 +29,15 @@
 
 def get_parser():
     parser = argparse.ArgumentParser(
-            description=('Provision a machine '
-                         'and run one or more UTAH runlists there.'),
-            epilog=("For example:\n"
-                    "Provision a VM using a precise server image "
-                    "with i386 architecture and run the two given runlists\n"
-                    "\t%(prog)s -s precise -t server -a i386 \\\n"
-                    "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                    "\t\t'http://people.canonical.com/~max/max_test.run'"),
-            formatter_class=argparse.RawDescriptionHelpFormatter)
+        description=('Provision a machine '
+                     'and run one or more UTAH runlists there.'),
+        epilog=("For example:\n"
+                "Provision a VM using a precise server image "
+                "with i386 architecture and run the two given runlists\n"
+                "\t%(prog)s -s precise -t server -a i386 \\\n"
+                "\t\t/usr/share/utah/client/examples/master.run \\\n"
+                "\t\t'http://people.canonical.com/~max/max_test.run'"),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         type=url_argument, help='URLs of runlist files to run')
     parser.add_argument('-m', '--machinetype', metavar='MACHINETYPE',
@@ -82,9 +82,10 @@
                         help='Enable json logging (default is YAML)')
     parser.add_argument('-f', '--files', action='append',
                         help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir', 
+    parser.add_argument('-o', '--outdir',
                         help=('Directory to store locally copied files '
-                         '(Default is ' + config.logpath + '/machine-name)'))
+                              '(Default is ' + config.logpath +
+                              '/machine-name)'))
     parser.add_argument('--diskbus', metavar='DISKBUS',
                         choices=('virtio', 'sata', 'ide'),
                         help=('Disk bus to use for customvm installation '
@@ -111,14 +112,15 @@
 
     try:
         inventory = TinySQLiteInventory()
-        machine = inventory.request(CustomVM,
-                arch=args.arch, boot=args.boot, clean=(not args.no_destroy), 
-                debug=args.debug, diskbus=args.diskbus,
-                disksizes=args.gigabytes, dlpercentincrement=10,
-                emulator=args.emulator, image=args.image, initrd=args.initrd,
-                installtype=args.type, kernel=args.kernel, new=True,
-                preseed=args.preseed, rewrite=args.rewrite,
-                series=args.series, xml=args.xml)
+        machine = inventory.request(
+            CustomVM,
+            arch=args.arch, boot=args.boot, clean=(not args.no_destroy),
+            debug=args.debug, diskbus=args.diskbus,
+            disksizes=args.gigabytes, dlpercentincrement=10,
+            emulator=args.emulator, image=args.image, initrd=args.initrd,
+            installtype=args.type, kernel=args.kernel, new=True,
+            preseed=args.preseed, rewrite=args.rewrite,
+            series=args.series, xml=args.xml)
         exitstatus, locallogs = run_tests(args, machine)
 
     except UTAHException as error:
 
=== modified file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2012-12-03 15:49:35 +0000
+++ examples/run_test_bamboo_feeder.py	2012-12-08 02:12:21 +0000
@@ -30,15 +30,15 @@
 
 def get_parser():
     parser = argparse.ArgumentParser(
-            description=('Provision a pandaboard in a bamboo-feeder setup '
-                         'and run one or more UTAH runlists there.'),
-            epilog=("For example:\n"
-                    "Provision a machine using a precise server image "
-                    "with i386 architecture and run the two given runlists\n"
-                    "\t%(prog)s -s precise -t server -a i386 \\\n"
-                    "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                    "\t\t'http://people.canonical.com/~max/max_test.run'"),
-            formatter_class=argparse.RawDescriptionHelpFormatter)
+        description=('Provision a pandaboard in a bamboo-feeder setup '
+                     'and run one or more UTAH runlists there.'),
+        epilog=("For example:\n"
+                "Provision a machine using a precise server image "
+                "with i386 architecture and run the two given runlists\n"
+                "\t%(prog)s -s precise -t server -a i386 \\\n"
+                "\t\t/usr/share/utah/client/examples/master.run \\\n"
+                "\t\t'http://people.canonical.com/~max/max_test.run'"),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         help='URLs of runlist files to run')
     parser.add_argument('-s', '--series', metavar='SERIES',
@@ -82,8 +82,8 @@
 
     try:
         inventory = ManualCobblerSQLiteInventory(
-                db=os.path.join('~', '.utah-bamboofeeder-inventory'),
-                lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
+            db=os.path.join('~', '.utah-bamboofeeder-inventory'),
+            lockfile=os.path.join('~', '.utah-bamboofeeder-lock'))
         kw = {}
         for arg in ['image', 'preseed']:
             value = vars(args)[arg]
 
=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-12-03 15:49:35 +0000
+++ examples/run_test_cobbler.py	2012-12-08 02:12:21 +0000
@@ -28,15 +28,15 @@
 
 def get_parser():
     parser = argparse.ArgumentParser(
-            description=('Provision a machine using cobbler '
-                         'and run one or more UTAH runlists there.'),
-            epilog=("For example:\n"
-                    "Provision a machine using a precise server image "
-                    "with i386 architecture and run the two given runlists\n"
-                    "\t%(prog)s -s precise -t server -a i386 \\\n"
-                    "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                    "\t\t'http://people.canonical.com/~max/max_test.run'"),
-            formatter_class=argparse.RawDescriptionHelpFormatter)
+        description=('Provision a machine using cobbler '
+                     'and run one or more UTAH runlists there.'),
+        epilog=("For example:\n"
+                "Provision a machine using a precise server image "
+                "with i386 architecture and run the two given runlists\n"
+                "\t%(prog)s -s precise -t server -a i386 \\\n"
+                "\t\t/usr/share/utah/client/examples/master.run \\\n"
+                "\t\t'http://people.canonical.com/~max/max_test.run'"),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         help='URLs of runlist files to run')
     parser.add_argument('-n', '--name', help='Name of machine to provision')
@@ -63,9 +63,10 @@
                         help='Enable json logging (default is YAML)')
     parser.add_argument('-f', '--files', action='append',
                         help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir', 
+    parser.add_argument('-o', '--outdir',
                         help=('Directory to store locally copied files '
-                         '(Default is ' + config.logpath + '/machine-name)'))
+                              '(Default is ' + config.logpath +
+                              '/machine-name)'))
     parser.add_argument('--rewrite', choices=('all', 'minimal', 'casperonly',
                         'none'), help='Enable or disable automatic '
                         'configuration rewriting')
 
=== modified file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2012-12-03 15:49:35 +0000
+++ examples/run_test_vm.py	2012-12-08 02:12:21 +0000
@@ -27,15 +27,15 @@
 
 def get_parser():
     parser = argparse.ArgumentParser(
-            description=('Create a virtual machine '
-                         'and run a UTAH runlist there.'),
-            epilog=("For example:\n"
-                    "Provision a VM using a precise server image "
-                    "with i386 architecture and run the two given runlists\n"
-                    "\t%(prog)s -s precise -t server -a i386 \\\n"
-                    "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                    "\t\t'http://people.canonical.com/~max/max_test.run'"),
-            formatter_class=argparse.RawDescriptionHelpFormatter)
+        description=('Create a virtual machine '
+                     'and run a UTAH runlist there.'),
+        epilog=("For example:\n"
+                "Provision a VM using a precise server image "
+                "with i386 architecture and run the two given runlists\n"
+                "\t%(prog)s -s precise -t server -a i386 \\\n"
+                "\t\t/usr/share/utah/client/examples/master.run \\\n"
+                "\t\t'http://people.canonical.com/~max/max_test.run'"),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         help='URLs of runlist files to run')
     parser.add_argument('-s', '--series', metavar='SERIES',
@@ -57,9 +57,10 @@
                         help='Enable json logging (default is YAML)')
     parser.add_argument('-f', '--files', action='append',
                         help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir', 
+    parser.add_argument('-o', '--outdir',
                         help=('Directory to store locally copied files '
-                         '(Default is ' + config.logpath + '/machine-name)'))
+                              '(Default is ' + config.logpath +
+                              '/machine-name)'))
     parser.add_argument('--dumplogs', action='store_true',
                         help='Write client output logs to standard out')
     return parser
 
=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-12-03 15:49:35 +0000
+++ examples/run_utah_tests.py	2012-12-08 02:12:21 +0000
@@ -28,17 +28,17 @@
 
 def get_parser():
     parser = argparse.ArgumentParser(
-            description=('Provision a machine '
-                         'and run one or more UTAH runlists there.\n\n'
-                         'The appropriate run_*.py script will be called, '
-                         'depending on the parameters passed.'),
-            epilog=("For example:\n"
-                    "Provision a VM using a precise server image "
-                    "with i386 architecture and run the two given runlists\n"
-                    "\t%(prog)s -s precise -t server -a i386 \\\n"
-                    "\t\t/usr/share/utah/client/examples/master.run \\\n"
-                    "\t\t'http://people.canonical.com/~max/max_test.run'"),
-            formatter_class=argparse.RawDescriptionHelpFormatter)
+        description=('Provision a machine '
+                     'and run one or more UTAH runlists there.\n\n'
+                     'The appropriate run_*.py script will be called, '
+                     'depending on the parameters passed.'),
+        epilog=("For example:\n"
+                "Provision a VM using a precise server image "
+                "with i386 architecture and run the two given runlists\n"
+                "\t%(prog)s -s precise -t server -a i386 \\\n"
+                "\t\t/usr/share/utah/client/examples/master.run \\\n"
+                "\t\t'http://people.canonical.com/~max/max_test.run'"),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         type=url_argument, help='URLs of runlist files to run')
     parser.add_argument('-m', '--machinetype', metavar='MACHINETYPE',
@@ -83,9 +83,10 @@
                         help='Enable json logging (default is YAML)')
     parser.add_argument('-f', '--files', action='append',
                         help='File or directory to copy from test system ')
-    parser.add_argument('-o', '--outdir', 
+    parser.add_argument('-o', '--outdir',
                         help=('Directory to store locally copied files '
-                         '(Default is ' + config.logpath + '/machine-name)'))
+                              '(Default is ' + config.logpath +
+                              '/machine-name)'))
     parser.add_argument('--diskbus', metavar='DISKBUS',
                         choices=('virtio', 'sata', 'ide'),
                         help=('Disk bus to use for customvm installation '
@@ -125,7 +126,7 @@
         # If machinetype is physical but arch isn't arm, use CobblerMachine
         from run_test_cobbler import run_test_cobbler
         function = run_test_cobbler
-    
+
     function(args=args)
 
 if __name__ == '__main__':
 
=== modified file 'setup.py'
--- setup.py	2012-12-03 15:49:35 +0000
+++ setup.py	2012-12-08 02:12:21 +0000
@@ -42,9 +42,10 @@
             maintainer = maintainer_info.rsplit('<', 1)[0].strip()
             maintainer_email = maintainer_info.rsplit('<', 1)[1].strip('>')
 
-setup(name='utah',
-      version=version,
-      packages=find_packages(),
-      maintainer=maintainer,
-      maintainer_email=maintainer_email,
+setup(
+    name='utah',
+    version=version,
+    packages=find_packages(),
+    maintainer=maintainer,
+    maintainer_email=maintainer_email,
 )
 
=== modified file 'tests/test_parser.py'
--- tests/test_parser.py	2012-12-06 16:30:34 +0000
+++ tests/test_parser.py	2012-12-08 02:12:21 +0000
@@ -26,6 +26,7 @@
   good:
 """
 
+
 class TestParser(unittest.TestCase):
     def setUp(self):
         self.logfile = '/tmp/utah.yaml'
 
=== modified file 'utah/client/common.py'
--- utah/client/common.py	2012-12-06 16:30:34 +0000
+++ utah/client/common.py	2012-12-08 02:12:21 +0000
@@ -31,9 +31,9 @@
 import jsonschema
 
 from utah.client.exceptions import (
-        YAMLParsingError,
-        YAMLEmptyFile,
-        )
+    YAMLParsingError,
+    YAMLEmptyFile,
+)
 
 
 PASS = 0
@@ -138,7 +138,7 @@
                            time_delta=str(time_delta),
                            cmd_type=cmd_type,
                            user=run_as,
-                          )
+                           )
 
     time_delta = datetime.datetime.now() - start_time
 
@@ -150,7 +150,7 @@
                        time_delta=str(time_delta),
                        cmd_type=cmd_type,
                        user=run_as,
-                      )
+                       )
 
 
 def normalize_encoding(value, encoding='utf-8'):
@@ -394,9 +394,9 @@
     uname = platform.uname()
 
     arch = {
-            'x86_64': 'amd64',
-            'x86': 'i386',
-            }.get(uname[5])  # 5 == processor
+        'x86_64': 'amd64',
+        'x86': 'i386',
+    }.get(uname[5])  # 5 == processor
 
     return arch
 
@@ -404,7 +404,7 @@
 def get_arch():
     """
     The host's architecture.
-    
+
     Returns the human readable architecture or 'unknown'.
     """
     arches = {
@@ -415,6 +415,7 @@
 
     return arches.get(platform.machine(), 'unknown')
 
+
 def get_release():
     """
     The host's release name (i.e. precise, quantal, etc.)
@@ -493,18 +494,18 @@
 
         if branch:
             self.get_command = "bzr branch {} {} {}".format(
-                    options,
-                    self.repo,
-                    destination,
-                    )
+                options,
+                self.repo,
+                destination,
+            )
 
             self.rev_command = "bzr revno"
         else:
             self.get_command = "bzr export {} {} {}".format(
-                    options,
-                    destination,
-                    self.repo,
-                    )
+                options,
+                destination,
+                self.repo,
+            )
 
             self.rev_command = "bzr revno {}".format(self.repo)
 
@@ -520,13 +521,14 @@
         self.destination = destination
 
         self.get_command = "git clone {} {} {}".format(
-                options,
-                self.repo,
-                destination,
-                )
+            options,
+            self.repo,
+            destination,
+        )
 
         self.rev_command = "git rev-parse HEAD"
 
+
 class DevHandler(VCSHandler):
     """ Copy from a local directory for development. """
 
@@ -535,8 +537,8 @@
         self.destination = destination
 
         self.get_command = "cp -r {} {}".format(
-                self.repo,
-                destination,
-                )
+            self.repo,
+            destination,
+        )
 
         self.rev_command = "echo 'DEVELOPMENT'"
 
=== modified file 'utah/client/phoenix.py'
--- utah/client/phoenix.py	2012-12-03 15:49:35 +0000
+++ utah/client/phoenix.py	2012-12-08 02:12:21 +0000
@@ -51,26 +51,26 @@
 timeout: 60
 command: {0}
 run_as: {0}
-#build_cmd: 
-#tc_setup: 
-#tc_cleanup: 
+#build_cmd:
+#tc_setup:
+#tc_cleanup:
 """.format(CHANGEME)
         self.master_run_content = """---
 testsuites:
 """
 
         self.FILE_CONTENT = {
-                TSLIST_NAME: self.tslist_content,
-                TS_CONTROL_NAME: self.ts_control_content,
-                TC_CONTROL_NAME: self.tc_control_content,
-                MASTER_NAME: self.master_run_content,
-                }
+            TSLIST_NAME: self.tslist_content,
+            TS_CONTROL_NAME: self.ts_control_content,
+            TC_CONTROL_NAME: self.tc_control_content,
+            MASTER_NAME: self.master_run_content,
+        }
 
         self.FILES = [
-                TSLIST_NAME,
-                TS_CONTROL_NAME,
-                MASTER_NAME,
-                ]
+            TSLIST_NAME,
+            TS_CONTROL_NAME,
+            MASTER_NAME,
+        ]
         # Add testcase files
         for d in self.testcases:
             self.FILES.append(os.path.join(d, TC_CONTROL_NAME))
@@ -78,9 +78,9 @@
 
         self.FILE_CONTENT[MASTER_NAME] += "  - name: {}\n".format(testsuite)
         self.FILE_CONTENT[MASTER_NAME] += \
-                "    fetch_method: {} # one of 'bzr', 'bzr-export', 'dev', 'git'\n".format(CHANGEME)
+            "    fetch_method: {} # one of 'bzr', 'bzr-export', 'dev', 'git'\n".format(CHANGEME)
         self.FILE_CONTENT[MASTER_NAME] += \
-                "    fetch_location: {}\n".format(CHANGEME)
+            "    fetch_location: {}\n".format(CHANGEME)
 
     def debug(self):
         for f in self.FILE_CONTENT.keys():
@@ -112,7 +112,8 @@
 
         # create the tslist.run file
         tslist_file = os.path.join(ts_dir, TSLIST_NAME)
-        self.create_file(tslist_file, self.FILE_CONTENT[TSLIST_NAME], append_if_exists=True)
+        self.create_file(tslist_file, self.FILE_CONTENT[TSLIST_NAME],
+                         append_if_exists=True)
 
         # create the test case directories
         for tc in self.testcases:
@@ -130,18 +131,18 @@
 
     parser = argparse.ArgumentParser(description='phoenix bootstrapper')
     parser.add_argument('testsuite', metavar='TESTSUITE', type=str, nargs=1,
-            help='name of the testsuite to create')
+                        help='name of the testsuite to create')
     parser.add_argument('testcases', metavar='TESTCASE', type=str, nargs='*',
-            help='names of testcases to create')
+                        help='names of testcases to create')
     parser.add_argument('--directory', '-D', dest='directory', default='.',
-            help='where to create the testsuite')
+                        help='where to create the testsuite')
 
     args = parser.parse_args()
 
     phoenix = Phoenix(args.testsuite[0],
-            directory=args.directory,
-            testcases=args.testcases,
-            )
+                      directory=args.directory,
+                      testcases=args.testcases,
+                      )
     phoenix.build_suite()
 
 if __name__ == "__main__":
 
=== modified file 'utah/client/result.py'
--- utah/client/result.py	2012-12-06 16:30:34 +0000
+++ utah/client/result.py	2012-12-08 02:12:21 +0000
@@ -18,11 +18,11 @@
 import yaml
 
 from .common import (
-        get_host_info,
-        get_build_number,
-        get_release,
-        get_arch,
-        )
+    get_host_info,
+    get_build_number,
+    get_release,
+    get_arch,
+)
 
 
 def get_smoke_data(_result):
@@ -48,9 +48,9 @@
         return None
 
     type_map = {
-            'smoke': get_smoke_data,
-            'kernel-sru': get_kernel_sru_data,
-            }
+        'smoke': get_smoke_data,
+        'kernel-sru': get_kernel_sru_data,
+    }
 
     if publish_type and publish_type in type_map.iterkeys():
         return type_map[publish_type](result)
@@ -61,7 +61,7 @@
     Result collection class.
     """
     def __init__(self, name=None, testsuite=None, testcase=None,
-            runlist=None, publish_type=None, install_type=None):
+                 runlist=None, publish_type=None, install_type=None):
         self.results = []
         self.status = 'PASS'
         self.name = name
@@ -188,20 +188,20 @@
         """
         host_info = get_host_info()
         data = {
-                'runlist': self.runlist,
-                'commands': self.results,
-                'errors': self.errors,
-                'failures': self.failures,
-                'fetch_errors': self.fetch_errors,
-                'passes': self.passes,
-                'uname': list(host_info['uname']),
-                'media-info': host_info['media-info'],
-                'install_type': self.install_type,
-                'build_number': get_build_number(),
-                'release': get_release(),
-                'ran_at': self.results[0]['start_time'],
-                'arch': get_arch(),
-                'name': self.name,
+            'runlist': self.runlist,
+            'commands': self.results,
+            'errors': self.errors,
+            'failures': self.failures,
+            'fetch_errors': self.fetch_errors,
+            'passes': self.passes,
+            'uname': list(host_info['uname']),
+            'media-info': host_info['media-info'],
+            'install_type': self.install_type,
+            'build_number': get_build_number(),
+            'release': get_release(),
+            'ran_at': self.results[0]['start_time'],
+            'arch': get_arch(),
+            'name': self.name,
         }
 
         if self.publish is not None:
 
=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2012-12-06 16:30:34 +0000
+++ utah/client/runner.py	2012-12-08 02:12:21 +0000
@@ -26,15 +26,15 @@
 import jsonschema
 
 from utah.client.common import (
-        MASTER_RUNLIST,
-        UTAH_DIR,
-        DEFAULT_STATE_FILE,
-        RETURN_CODES,
-        parse_yaml_file,
-        BzrHandler,
-        DevHandler,
-        GitHandler,
-        )
+    MASTER_RUNLIST,
+    UTAH_DIR,
+    DEFAULT_STATE_FILE,
+    RETURN_CODES,
+    parse_yaml_file,
+    BzrHandler,
+    DevHandler,
+    GitHandler,
+)
 
 RC_LOCAL = '/etc/rc.local'
 RC_LOCAL_BACKUP = '%s-utah.bak' % RC_LOCAL
@@ -63,24 +63,24 @@
             'name': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'fetch_method': {
                 'type': 'string',
                 'enum': ['bzr', 'bzr-export', 'dev', 'git'],
                 'required': True,
-                },
+            },
             'fetch_location': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'include_tests': {
                 'type': 'array',
                 'items': {'type': 'string'},
-                },
+            },
             'exclude_tests': {
                 'type': 'array',
                 'items': {'type': 'string'},
-                },
+            },
         },
     }
 
@@ -99,7 +99,7 @@
         'items': {
             'type': [TESTSUITE_ENTRY_SCHEMA, TESTSUITE_INCLUDE_SCHEMA],
             'required': True,
-            },
+        },
     }
 
     MASTER_RUNLIST_SCHEMA_NEW = {
@@ -108,33 +108,33 @@
             "timeout": {
                 "type": "integer",
                 "minimum": 0,
-                },
+            },
             "repeat_count": {
                 "type": "integer",
                 "minimum": 0,
-                },
+            },
             "type": {
                 'type': 'string',
                 'enum': ['smoke', 'kernel-sru', 'bootspeed', 'upgrade'],
-                },
+            },
             "name": {
                 'type': 'string',
-                },
+            },
             "testsuites": {
                 # must be a list to accept a schema rather than a simple type
                 "type": [MASTER_RUNLIST_SCHEMA_ORIG],
                 "required": True,
-                },
-            }
+            },
         }
+    }
 
     MASTER_RUNLIST_SCHEMA = {
-            'type': [MASTER_RUNLIST_SCHEMA_ORIG, MASTER_RUNLIST_SCHEMA_NEW],
-            'required': True,
-            }
+        'type': [MASTER_RUNLIST_SCHEMA_ORIG, MASTER_RUNLIST_SCHEMA_NEW],
+        'required': True,
+    }
 
     def __init__(self, install_type, runlist=None, result_class=Result,
-            testdir=UTAH_DIR, state_agent=None, resume=False):
+                 testdir=UTAH_DIR, state_agent=None, resume=False):
 
         # Runlist URL passed through the command line
         self.testdir = testdir
@@ -318,8 +318,9 @@
 
         self.backup_runlist = os.path.join(self.testdir, 'master.run-reboot')
 
-        if (os.path.exists(self.master_runlist)
-            and self.master_runlist != self.backup_runlist):
+        if (os.path.exists(
+                self.master_runlist)
+                and self.master_runlist != self.backup_runlist):
             shutil.copyfile(self.master_runlist, self.backup_runlist)
 
         state = {
@@ -374,9 +375,9 @@
             jsonschema.validate(data, self.MASTER_RUNLIST_SCHEMA)
         except jsonschema.ValidationError as exception:
             raise exceptions.ValidationError(
-                    'Master runlist failed to validate: {!r}\n'
-                    'Detailed information: {}'
-                    .format(local_filename, exception))
+                'Master runlist failed to validate: {!r}\n'
+                'Detailed information: {}'
+                .format(local_filename, exception))
 
         if 'timeout' in data:
             self.timeout = int(data['timeout'])
@@ -417,7 +418,7 @@
                 vcs_handler = BzrHandler(repo=fetch_location, destination=name)
             elif fetch_method == 'bzr-export':
                 vcs_handler = BzrHandler(branch=False,
-                        repo=fetch_location, destination=name)
+                                         repo=fetch_location, destination=name)
             elif fetch_method == 'dev':
                 vcs_handler = DevHandler(repo=fetch_location, destination=name)
             else:
@@ -467,7 +468,6 @@
                               _reboot_callback=self.reboot)
                 self.add_suite(s)
 
-
     def get_next_suite(self):
         """
         Return the next suite to be run.
 
=== modified file 'utah/client/testcase.py'
--- utah/client/testcase.py	2012-12-06 16:30:34 +0000
+++ utah/client/testcase.py	2012-12-08 02:12:21 +0000
@@ -19,19 +19,19 @@
 import jsonschema
 
 from utah.client.common import (
-        run_cmd,
-        parse_control_file,
-        do_nothing,
-        CMD_TC_BUILD,
-        CMD_TC_SETUP,
-        CMD_TC_TEST,
-        CMD_TC_CLEANUP,
-        )
+    run_cmd,
+    parse_control_file,
+    do_nothing,
+    CMD_TC_BUILD,
+    CMD_TC_SETUP,
+    CMD_TC_TEST,
+    CMD_TC_CLEANUP,
+)
 from utah.client.exceptions import (
-        MissingFile,
-        ValidationError,
-        MissingData,
-        )
+    MissingFile,
+    ValidationError,
+    MissingData,
+)
 
 
 class TestCase(object):
@@ -42,7 +42,7 @@
     """
 
     status = 'NOTRUN'
-    summary = 'PASS' # 'PASS', 'FAIL', of 'ERROR'
+    summary = 'PASS'  # 'PASS', 'FAIL', of 'ERROR'
     build_cmd = None
     tc_setup = None
     tc_cleanup = None
@@ -57,41 +57,41 @@
             'description': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'dependencies': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'action': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'expected_results': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'type': {
                 'type': 'string',
                 'enum': ['userland']
-                },
+            },
             'timeout': {'type': 'integer'},
             'build_cmd': {'type': 'string'},
             'command': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'run_as': {
                 'type': 'string',
                 'required': True,
-                },
+            },
             'tc_setup': {'type': 'string'},
             'tc_cleanup': {'type': 'string'},
             'reboot': {
                 'type': 'string',
                 'enum': ['always', 'pass', 'never'],
-                },
             },
-        }
+        },
+    }
 
     def __init__(self, name, path, result, command=None, timeout=None,
                  _control_data=None, _save_state_callback=None,
@@ -131,9 +131,9 @@
                                                       self.CONTROL_SCHEMA)
                 except jsonschema.ValidationError as exception:
                     raise ValidationError(
-                            '{!r} test case control file invalid: {!r}\n'
-                            'Detailed information: {}'
-                            .format(self.name, self.filename, exception))
+                        '{!r} test case control file invalid: {!r}\n'
+                        'Detailed information: {}'
+                        .format(self.name, self.filename, exception))
             else:
                 raise MissingFile(self.filename)
         else:
@@ -239,20 +239,20 @@
             self.status = "RUN"
             self.save_state_callback()
             extra_info = {
-                    'description': self.description,
-                    'dependencies': self.dependencies,
-                    'action': self.action,
-                    'expected_results': self.expected_results,
-                    }
+                'description': self.description,
+                'dependencies': self.dependencies,
+                'action': self.action,
+                'expected_results': self.expected_results,
+            }
             result.add_result(run_cmd(self.command,
                                       timeout=timeout,
                                       cwd=self.working_dir,
                                       cmd_type=CMD_TC_TEST,
                                       run_as=self.run_as,
                                       ),
-                                      extra_info=extra_info)
+                              extra_info=extra_info)
 
-            # only if we haven't failed or errored so far do 
+            # only if we haven't failed or errored so far do
             # we set the summary for the testcase.
             if self.summary == 'PASS':
                 self.summary = result.status
@@ -261,9 +261,11 @@
         self.cleanup(result)
 
         need_reboot = False
-        if (self.reboot == 'always'
-            or self.reboot == 'pass'
-            and result.status == 'PASS'):
+        if (
+                self.reboot == 'always'
+                or self.reboot == 'pass'
+                and result.status == 'PASS'
+        ):
             need_reboot = True
 
         result.status = 'PASS'
@@ -299,20 +301,20 @@
         Returns a dictionary representing the test's state.
         """
         state = {
-                'name': self.name,
-                'path': self.path,
-                'command': self.command,
-                'timeout': self.timeout,
-                'status': self.status,
-                'summary': self.summary,
-                'build_cmd': self.build_cmd,
-                'tc_setup': self.tc_setup,
-                'tc_cleanup': self.tc_cleanup,
-                'type': self.type,
-                'description': self.description,
-                'dependencies': self.dependencies,
-                'action': self.action,
-                'expected_results': self.expected_results,
+            'name': self.name,
+            'path': self.path,
+            'command': self.command,
+            'timeout': self.timeout,
+            'status': self.status,
+            'summary': self.summary,
+            'build_cmd': self.build_cmd,
+            'tc_setup': self.tc_setup,
+            'tc_cleanup': self.tc_cleanup,
+            'type': self.type,
+            'description': self.description,
+            'dependencies': self.dependencies,
+            'action': self.action,
+            'expected_results': self.expected_results,
         }
 
         return state
 
=== modified file 'utah/client/tests/__init__.py'
--- utah/client/tests/__init__.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/__init__.py	2012-12-08 02:12:21 +0000
@@ -12,4 +12,3 @@
 
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 
=== modified file 'utah/client/tests/common.py'
--- utah/client/tests/common.py	2012-12-06 16:30:34 +0000
+++ utah/client/tests/common.py	2012-12-08 02:12:21 +0000
@@ -105,6 +105,7 @@
     if os.path.exists(examples_dir):
         shutil.rmtree(examples_dir)
 
+
 def _get_partial_state_file(filename):
     """
     Read a partial state file from disk.
@@ -118,16 +119,16 @@
     return state
 
 partial_state_file_content = _get_partial_state_file(
-        os.path.join(os.path.dirname(__file__), "..", "examples",
-            "test_state_partial_inprogress.yaml")
+    os.path.join(os.path.dirname(__file__), "..", "examples",
+                 "test_state_partial_inprogress.yaml")
 )
 
 partial_state_file_content_run_all = _get_partial_state_file(
-        os.path.join(os.path.dirname(__file__), "..", "examples",
-            "test_state_partial_run_all.yaml")
+    os.path.join(os.path.dirname(__file__), "..", "examples",
+                 "test_state_partial_run_all.yaml")
 )
 
 partial_state_file_content_done_all_failed = _get_partial_state_file(
-        os.path.join(os.path.dirname(__file__), "..", "examples",
-            "test_state_partial_all_failed.yaml")
+    os.path.join(os.path.dirname(__file__), "..", "examples",
+                 "test_state_partial_all_failed.yaml")
 )
 
=== modified file 'utah/client/tests/manual_privileges.py'
--- utah/client/tests/manual_privileges.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/manual_privileges.py	2012-12-08 02:12:21 +0000
@@ -87,7 +87,7 @@
 
 def stat_file(filename=TMP_FILENAME):
     proc = subprocess.Popen(['ls', '-al', filename], stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE)
+                            stderr=subprocess.PIPE)
 
     stdout, _stderr = proc.communicate()
     print("{}: {}".format(filename, stdout))
@@ -183,6 +183,6 @@
             'euid': NOBODY_UID,
             'gid': NOGROUP_GID,
             'egid': NOGROUP_GID,
-            })
+        })
 
         _do_cmd("id")
 
=== modified file 'utah/client/tests/test_common.py'
--- utah/client/tests/test_common.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_common.py	2012-12-08 02:12:21 +0000
@@ -18,13 +18,13 @@
 
 # REQUIRES that the top level utah package be in the Python path.
 from utah.client.common import (
-        get_media_info,
-        get_product_uuid,
-        get_host_info,
-        run_cmd,
-        debug_print,
-        CONFIG,
-        )
+    get_media_info,
+    get_product_uuid,
+    get_host_info,
+    run_cmd,
+    debug_print,
+    CONFIG,
+)
 
 
 class TestCommon(unittest.TestCase):
 
=== modified file 'utah/client/tests/test_jsonschema.py'
--- utah/client/tests/test_jsonschema.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_jsonschema.py	2012-12-08 02:12:21 +0000
@@ -54,28 +54,28 @@
 """
 
 yaml_content_bad = [
-"""---
+    """---
 testsuties:
     - name: testsuite1
       fetch_method: bzr
       fetch_location: lp:utah
 """,  # typo
-"""---
+    """---
 timeout: 101
 repeat_count: 99
 """,  # missing testsuites
-"""---
+    """---
 - name: blah
 - name: blip
 """,  # missing fetch options
-"""---
+    """---
 testsuites:
   - name: blah
   - name: blip
 """,  # missing fetch options
-"""---
+    """---
 testsuites:
-""", # no testsuites
+""",  # no testsuites
 ]
 
 
 
=== modified file 'utah/client/tests/test_phoenix.py'
--- utah/client/tests/test_phoenix.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_phoenix.py	2012-12-08 02:12:21 +0000
@@ -39,19 +39,19 @@
 
     def setUp(self):
         self.phoenix = Phoenix(
-                self.testsuite_name,
-                directory=self.directory_name,
-                testcases=self.testcases,
-                )
+            self.testsuite_name,
+            directory=self.directory_name,
+            testcases=self.testcases,
+        )
 
     def test_missing_required_args(self):
         """
         Test that __init__ fails without the required arguments
         """
         self.assertRaises(
-                TypeError,
-                Phoenix,
-                )
+            TypeError,
+            Phoenix,
+        )
 
     def test_providing_required_args(self):
         """
@@ -109,13 +109,13 @@
             tc_paths.append(os.path.join(ts_path, tc))
 
         self.assertTrue(os.path.exists(dir_path),
-                "{} doesn't exist".format(dir_path))
+                        "{} doesn't exist".format(dir_path))
         self.assertTrue(os.path.exists(ts_path),
-                "{} doesn't exist".format(ts_path))
+                        "{} doesn't exist".format(ts_path))
 
         for path in tc_paths:
             self.assertTrue(os.path.exists(path),
-                    "{} doesn't exist".format(path))
+                            "{} doesn't exist".format(path))
 
     def test_create_file(self):
         """
 
=== modified file 'utah/client/tests/test_result.py'
--- utah/client/tests/test_result.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_result.py	2012-12-08 02:12:21 +0000
@@ -17,9 +17,9 @@
 import yaml
 
 from utah.client.result import (
-        Result,
-        ResultYAML,
-        )
+    Result,
+    ResultYAML,
+)
 
 
 class TestResult(unittest.TestCase):
 
=== modified file 'utah/client/tests/test_runner.py'
--- utah/client/tests/test_runner.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_runner.py	2012-12-08 02:12:21 +0000
@@ -24,12 +24,13 @@
 from utah.client.common import RETURN_CODES
 from utah.client import exceptions
 
-from .common import (  # NOQA
-        setUp,  # Used by nosetests
-        tearDown,  # Used by nosetests
-        master_runlist_content,
-        get_module_path,
-        )
+from .common import (
+    # NOQA
+    setUp,  # Used by nosetests
+    tearDown,  # Used by nosetests
+    master_runlist_content,
+    get_module_path,
+)
 
 
 class TestRunner(unittest.TestCase):
@@ -43,7 +44,7 @@
         self.bad_dir = "/tmp/does_not_exist"
 
         self.assertFalse(os.path.exists(self.bad_dir),
-                "{} shouldn't exist".format(self.bad_dir))
+                         "{} shouldn't exist".format(self.bad_dir))
 
     def tearDown(self):
 
@@ -73,7 +74,7 @@
         fp.close()
 
         runner = Runner(install_type='desktop', result_class=self.result_class,
-                state_agent=self.state_agent, runlist=runlist)
+                        state_agent=self.state_agent, runlist=runlist)
 
         # remove the runlist as early as possible to avoid leaving it
         # laying around if this test fails.
 
=== modified file 'utah/client/tests/test_state_agent.py'
--- utah/client/tests/test_state_agent.py	2012-12-06 16:30:34 +0000
+++ utah/client/tests/test_state_agent.py	2012-12-08 02:12:21 +0000
@@ -23,15 +23,15 @@
 from utah.client.result import ResultYAML
 from utah.client.common import UTAH_DIR
 
-from .common import (  # NOQA
-        setUp,  # Used by nosetests
-        tearDown,  # Used by nosetests
-        get_module_path,
-        partial_state_file_content,
-        partial_state_file_content_run_all,
-        partial_state_file_content_done_all_failed,
-        )
-
+from .common import (
+    # NOQA
+    setUp,  # Used by nosetests
+    tearDown,  # Used by nosetests
+    get_module_path,
+    partial_state_file_content,
+    partial_state_file_content_run_all,
+    partial_state_file_content_done_all_failed,
+)
 
 
 class TestStateAgentYAML(unittest.TestCase):
@@ -42,15 +42,19 @@
         self.state_file = '/tmp/state.yaml'
 
         # Fail if there is already a test state file.
-        self.assertFalse(os.path.exists(self.state_file),
-                         "state file (%s) already exists" % self.state_file)
+        self.assertFalse(
+            os.path.exists(self.state_file),
+            "state file (%s) already exists" % self.state_file)
 
         self.state_agent = StateAgentYAML(state_file=self.state_file)
-        self.runner = Runner(install_type="desktop", result_class=ResultYAML,
-                             state_agent=self.state_agent)
+        self.runner = Runner(
+            install_type="desktop", result_class=ResultYAML,
+            state_agent=self.state_agent)
         self.partial_state_file_content = partial_state_file_content
-        self.partial_state_file_content_run_all = partial_state_file_content_run_all
-        self.partial_state_file_content_done_all_failed = partial_state_file_content_done_all_failed
+        self.partial_state_file_content_run_all = \
+            partial_state_file_content_run_all
+        self.partial_state_file_content_done_all_failed = \
+            partial_state_file_content_done_all_failed
 
     def tearDown(self):
         """
@@ -112,7 +116,7 @@
 
         # Need to set up utah_tests since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
-                'examples', 'utah_tests')
+                                'examples', 'utah_tests')
         test_dir = os.path.join(UTAH_DIR, 'testsuites',
                                 'utah_tests', 'utah_tests')
         if not os.path.exists(test_dir):
@@ -120,17 +124,18 @@
 
         # Need to set up utah_tests_sample since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
-                'examples', 'utah_tests_sample')
-        test_dir = os.path.join(UTAH_DIR, 'testsuites', 'utah_tests_sample',
-                'utah_tests_sample')
+                                'examples', 'utah_tests_sample')
+        test_dir = os.path.join(UTAH_DIR, 'testsuites',
+                                'utah_tests_sample', 'utah_tests_sample')
         if not os.path.exists(test_dir):
             shutil.copytree(test_src, test_dir)
 
         state_agent = StateAgentYAML(state_file=self.state_file)
-        runner = Runner(install_type="desktop",
-                state_agent=state_agent,
-                result_class=ResultYAML,
-                resume=True)
+        runner = Runner(
+            install_type="desktop",
+            state_agent=state_agent,
+            result_class=ResultYAML,
+            resume=True)
 
         self.assertEqual(runner.status, 'RUN')
         self.assertEqual(runner.count_suites(), 3)
@@ -157,7 +162,7 @@
 
         # Need to set up utah_tests since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
-                'examples', 'utah_tests')
+                                'examples', 'utah_tests')
         test_dir = os.path.join(UTAH_DIR, 'testsuites',
                                 'utah_tests', 'utah_tests')
         if not os.path.exists(test_dir):
@@ -165,17 +170,17 @@
 
         # Need to set up utah_tests_sample since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
-                'examples', 'utah_tests_sample')
-        test_dir = os.path.join(UTAH_DIR, 'testsuites', 'utah_tests_sample',
-                'utah_tests_sample')
+                                'examples', 'utah_tests_sample')
+        test_dir = os.path.join(UTAH_DIR, 'testsuites',
+                                'utah_tests_sample', 'utah_tests_sample')
         if not os.path.exists(test_dir):
             shutil.copytree(test_src, test_dir)
 
         state_agent = StateAgentYAML(state_file=self.state_file)
         runner = Runner(install_type="desktop",
-                state_agent=state_agent,
-                result_class=ResultYAML,
-                resume=True)
+                        state_agent=state_agent,
+                        result_class=ResultYAML,
+                        resume=True)
 
         self.assertEqual(runner.status, 'RUN')
         self.assertEqual(runner.count_suites(), 3)
@@ -202,7 +207,7 @@
 
         # Need to set up utah_tests since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
-                'examples', 'utah_tests')
+                                'examples', 'utah_tests')
         test_dir = os.path.join(UTAH_DIR, 'testsuites',
                                 'utah_tests', 'utah_tests')
         if not os.path.exists(test_dir):
@@ -210,17 +215,17 @@
 
         # Need to set up utah_tests_sample since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
-                'examples', 'utah_tests_sample')
-        test_dir = os.path.join(UTAH_DIR, 'testsuites', 'utah_tests_sample',
-                'utah_tests_sample')
+                                'examples', 'utah_tests_sample')
+        test_dir = os.path.join(UTAH_DIR, 'testsuites',
+                                'utah_tests_sample', 'utah_tests_sample')
         if not os.path.exists(test_dir):
             shutil.copytree(test_src, test_dir)
 
         state_agent = StateAgentYAML(state_file=self.state_file)
         runner = Runner(install_type="desktop",
-                state_agent=state_agent,
-                result_class=ResultYAML,
-                resume=True)
+                        state_agent=state_agent,
+                        result_class=ResultYAML,
+                        resume=True)
 
         self.assertEqual(runner.status, 'RUN')
         self.assertEqual(runner.count_suites(), 3)
 
=== modified file 'utah/client/tests/test_testcase.py'
--- utah/client/tests/test_testcase.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_testcase.py	2012-12-08 02:12:21 +0000
@@ -19,14 +19,15 @@
 from utah.client.exceptions import MissingData
 from utah.client.result import ResultYAML
 from utah.client.common import (
-        UTAH_DIR,
-        )
+    UTAH_DIR,
+)
 from utah.client import testcase
 
-from .common import (  # NOQA
-        setUp,  # Used by nosetests
-        tearDown,  # Used by nosetests
-        )
+from .common import (
+    # NOQA
+    setUp,  # Used by nosetests
+    tearDown,  # Used by nosetests
+)
 
 
 class TestTestCase(unittest.TestCase):
@@ -79,9 +80,9 @@
         state = self.case.save_state()
 
         case = testcase.TestCase(
-                name=self.name,
-                path=self.path,
-                result=ResultYAML()
+            name=self.name,
+            path=self.path,
+            result=ResultYAML()
         )
         case.load_state(state)
 
@@ -99,10 +100,10 @@
     def test_timeout_override(self):
         timeout = 99
         case = testcase.TestCase(
-                name=self.name,
-                path=self.path,
-                timeout=timeout,
-                result=ResultYAML()
+            name=self.name,
+            path=self.path,
+            timeout=timeout,
+            result=ResultYAML()
         )
 
         self.assertEqual(timeout, case.timeout)
@@ -113,21 +114,21 @@
         doesn't raise an exception.
         """
         control_data = {
-                'description': 'a test case',
-                'command': '/bin/true',
-                'dependencies': 'n/a',
-                'action': 'n/a',
-                'expected_results': 'n/a',
-                }
+            'description': 'a test case',
+            'command': '/bin/true',
+            'dependencies': 'n/a',
+            'action': 'n/a',
+            'expected_results': 'n/a',
+        }
 
         result = ResultYAML()
 
         case = testcase.TestCase(
-                name=self.name,
-                path=self.path,
-                result=result,
-                _control_data=control_data,
-                )
+            name=self.name,
+            path=self.path,
+            result=result,
+            _control_data=control_data,
+        )
 
         case.run()
         print result
@@ -141,18 +142,18 @@
         does raise an exception.
         """
         control_data = {
-                'description': 'a test case',
-                'command': '/bin/true',
-                }
+            'description': 'a test case',
+            'command': '/bin/true',
+        }
 
         result = ResultYAML()
 
         case = testcase.TestCase(
-                name=self.name,
-                path=self.path,
-                result=result,
-                _control_data=control_data,
-                )
+            name=self.name,
+            path=self.path,
+            result=result,
+            _control_data=control_data,
+        )
 
         with self.assertRaises(MissingData):
             case.run()
 
=== modified file 'utah/client/tests/test_testsuite.py'
--- utah/client/tests/test_testsuite.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_testsuite.py	2012-12-08 02:12:21 +0000
@@ -17,15 +17,16 @@
 import unittest
 
 from utah.client.common import (
-        debug_print,
-        )
+    debug_print,
+)
 from utah.client.result import ResultYAML
 from utah.client import testsuite
 
-from .common import (  # NOQA
-        setUp,  # Used by nosetests
-        tearDown,  # Used by nosetests
-        )
+from .common import (
+    # NOQA
+    setUp,  # Used by nosetests
+    tearDown,  # Used by nosetests
+)
 
 
 def state_saver():
@@ -81,11 +82,12 @@
     def test_timeout_override(self):
         timeout = 101
         suite = testsuite.TestSuite(
-                name=self.name,
-                path=self.path,
-                timeout=timeout,
-                result=ResultYAML(),
-                _save_state_callback=state_saver)
+            name=self.name,
+            path=self.path,
+            timeout=timeout,
+            result=ResultYAML(),
+            _save_state_callback=state_saver
+        )
 
         self.assertEqual(timeout, suite.timeout)
 
@@ -96,10 +98,12 @@
         """Included tests are executed"""
         included_test_name = 'test_one'
 
-        suite = testsuite.TestSuite(name=self.name,
-                                    includes=[included_test_name],
-                                    path=self.path,
-                                    result=ResultYAML())
+        suite = testsuite.TestSuite(
+            name=self.name,
+            includes=[included_test_name],
+            path=self.path,
+            result=ResultYAML()
+        )
 
         # Make sure just one test case has been selected
         self.assertEqual(len(suite.tests), 1)
@@ -112,10 +116,12 @@
         """Excluded tests are *not* executed"""
         excluded_test_name = 'test_two'
 
-        suite = testsuite.TestSuite(name=self.name,
-                                    excludes=[excluded_test_name],
-                                    path=self.path,
-                                    result=ResultYAML())
+        suite = testsuite.TestSuite(
+            name=self.name,
+            excludes=[excluded_test_name],
+            path=self.path,
+            result=ResultYAML()
+        )
 
         # Make sure just one test case has been selected
         self.assertEqual(len(suite.tests), 1)
@@ -129,11 +135,13 @@
         included_test_name = 'test_one'
         excluded_test_name = 'test_two'
 
-        suite = testsuite.TestSuite(name=self.name,
-                                    includes=[included_test_name],
-                                    excludes=[excluded_test_name],
-                                    path=self.path,
-                                    result=ResultYAML())
+        suite = testsuite.TestSuite(
+            name=self.name,
+            includes=[included_test_name],
+            excludes=[excluded_test_name],
+            path=self.path,
+            result=ResultYAML()
+        )
 
         # Make sure just one test case has been selected
         self.assertEqual(len(suite.tests), 1)
 
=== modified file 'utah/client/tests/test_yaml.py'
--- utah/client/tests/test_yaml.py	2012-12-03 14:02:18 +0000
+++ utah/client/tests/test_yaml.py	2012-12-08 02:12:21 +0000
@@ -21,15 +21,15 @@
     def test_parts(self):
         content = {}
         content['metadata'] = {
-                'runlist': '/tmp/master.run',
-                'host': 'Ubuntu 12.04 LTS',
+            'runlist': '/tmp/master.run',
+            'host': 'Ubuntu 12.04 LTS',
         }
         content['commands'] = [
-                {
-                    'command': 'rm -f blah',
-                    'stdout': '',
-                    'stderr': '',
-                }
+            {
+                'command': 'rm -f blah',
+                'stdout': '',
+                'stderr': '',
+            }
         ]
 
         enc_data = yaml.dump(content, default_flow_style=False)
@@ -42,28 +42,28 @@
 
     def test_parts_2(self):
         content = {
-                'file': '/tmp/file'
-                }
+            'file': '/tmp/file'
+        }
 
         extra_args = {
-                #'explicit_start': '---',
-                #'explicit_end': '...',
-                }
+            #'explicit_start': '---',
+            #'explicit_end': '...',
+        }
 
         enc_data = yaml.dump(content, default_flow_style=False, **extra_args)
 
         content = {
-                'commands':
-                    [
-                        {
-                            'size': 100,
-                            'perms': 'rwxr-xr-x',
-                        },
-                        {
-                            'size': 120,
-                            'perms': 'rwxr-xr-x',
-                        },
-                    ]
+            'commands':
+            [
+                {
+                    'size': 100,
+                    'perms': 'rwxr-xr-x',
+                },
+                {
+                    'size': 120,
+                    'perms': 'rwxr-xr-x',
+                },
+            ]
         }
 
         enc_data += yaml.dump(content, default_flow_style=False, **extra_args)
@@ -78,19 +78,19 @@
     def test_parts_3(self):
         extra_args = {}
         content = [
-                {
-                    'file': '/tmp/file',
-                },
-                [
-                    {
-                        'size': 100,
-                        'perms': 'rwxr-xr-x',
-                    },
-                    {
-                        'size': 120,
-                        'perms': 'rwxr-xr-x',
-                    },
-                ]
+            {
+                'file': '/tmp/file',
+            },
+            [
+                {
+                    'size': 100,
+                    'perms': 'rwxr-xr-x',
+                },
+                {
+                    'size': 120,
+                    'perms': 'rwxr-xr-x',
+                },
+            ]
         ]
         enc_data = yaml.dump(content, default_flow_style=False, **extra_args)
         print(enc_data)
 
=== modified file 'utah/client/testsuite.py'
--- utah/client/testsuite.py	2012-12-06 16:30:34 +0000
+++ utah/client/testsuite.py	2012-12-08 02:12:21 +0000
@@ -64,11 +64,11 @@
                 'test': {
                     'type': 'string',
                     'required': True,
-                    },
-                'overrides': {'type': 'object'},
                 },
+            'overrides': {'type': 'object'},
             },
-        }
+        },
+    }
 
     CONTROL_SCHEMA = {
         'type': 'object',
@@ -77,8 +77,8 @@
             'timeout': {'type': 'integer'},
             'ts_setup': {'type': 'string'},
             'ts_cleanup': {'type': 'string'},
-             }
         }
+    }
 
     def __init__(self, name, path, result, runlist_file=DEFAULT_TSLIST,
                  control_file=DEFAULT_TSCONTROL, includes=None, excludes=None,
@@ -128,9 +128,9 @@
                 control_data = None
             except jsonschema.ValidationError as exception:
                 raise ValidationError(
-                        '{!r} test suite control file invalid: {!r}\n'
-                        'Detailed information: {}'
-                        .format(self.name, self.control_file, exception))
+                    '{!r} test suite control file invalid: {!r}\n1'
+                    'Detailed information: {}'
+                    .format(self.name, self.control_file, exception))
 
         if control_data is not None:
             # already initialized
@@ -146,9 +146,9 @@
                 runlist_data = parse_runlist_file(self.runlist_file)
             except jsonschema.ValidationError as exception:
                 raise ValidationError(
-                        '{!r} test suite runlist invalid: {!r}\n'
-                        'Detailed information: {}'
-                        .format(self.name, self.runlist_file, exception))
+                    '{!r} test suite runlist invalid: {!r}\n'
+                    'Detailed information: {}'
+                    .format(self.name, self.runlist_file, exception))
         else:
             raise MissingFile('File not found: {}'.format(self.runlist_file))
 
 
=== modified file 'utah/config.py'
--- utah/config.py	2012-12-03 15:49:35 +0000
+++ utah/config.py	2012-12-08 02:12:21 +0000
@@ -113,14 +113,15 @@
     # Default setting for configuration rewriting
     rewrite='all',
     # Available releases
-    serieschoices=[           # Remember to update uqt-vm-tools.conf as well
-                   'hardy',
-                   'lucid',
-                   'oneiric',
-                   'precise',
-                   'quantal',
-                   'raring',
-                   ],
+    serieschoices=[
+        # Remember to update uqt-vm-tools.conf as well
+        'hardy',
+        'lucid',
+        'oneiric',
+        'precise',
+        'quantal',
+        'raring',
+    ],
     # Default machine template
     template=None,
     # Directory to hold web-accessible files
@@ -155,8 +156,9 @@
                                         LOCALDEFAULTS['hostname'] + '.log')
 # Default logfile is /var/log/utah/{hostname}-debug.log
 # Set to None to disable separate debug log
-LOCALDEFAULTS['debuglog'] = os.path.join(DEFAULTS['logpath'],
-                                    LOCALDEFAULTS['hostname'] + '-debug.log')
+LOCALDEFAULTS['debuglog'] = os.path.join(
+    DEFAULTS['logpath'],
+    LOCALDEFAULTS['hostname'] + '-debug.log')
 
 # This depends on a binary that may not be installed.
 # Also, the null thing may seem obvious, but I found it here:
@@ -167,18 +169,18 @@
                        stdout=fnull, stderr=fnull) == 0:
         # If dpkg-architecture is available, default to current host arch
         LOCALDEFAULTS['arch'] = subprocess.check_output(
-                ['dpkg-architecture', '-qDEB_HOST_ARCH']).strip()
+            ['dpkg-architecture', '-qDEB_HOST_ARCH']).strip()
     else:
         # Otherwise, default to i386
         LOCALDEFAULTS['arch'] = 'i386'
-        
+
 # I'm not sure lsb_release is always around
 with open(os.devnull, 'w') as fnull:
     if subprocess.call(['which', 'lsb_release'],
                        stdout=fnull, stderr=fnull) == 0:
         # If lsb_release is available, default to current series
         LOCALDEFAULTS['series'] = subprocess.check_output(
-                ['lsb_release', '-sc']).strip()
+            ['lsb_release', '-sc']).strip()
     else:
         # Otherwise, default to precise
         LOCALDEFAULTS['series'] = 'precise'
 
=== modified file 'utah/iso.py'
--- utah/iso.py	2012-12-07 11:10:30 +0000
+++ utah/iso.py	2012-12-08 02:12:21 +0000
@@ -108,7 +108,7 @@
         if config.debuglog is not None:
             self.logger.setLevel(logging.DEBUG)
             self.debughandler = (
-                    logging.handlers.WatchedFileHandler(config.debuglog))
+                logging.handlers.WatchedFileHandler(config.debuglog))
             self.debughandler.setFormatter(file_formatter)
             self.debughandler.setLevel(logging.DEBUG)
             self.logger.addHandler(self.debughandler)
@@ -242,7 +242,7 @@
             if '-O' in cmd:
                 cmd.remove('-O')
             return subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE, **kw).communicate()
+                                    stderr=subprocess.PIPE, **kw).communicate()
         else:
             cmd = self.getrealfile(filename)
             return subprocess.call(cmd, stdout=open(outfile, 'w'), **kw)
@@ -325,8 +325,8 @@
             # Set the path to our files and the name of the iso we want
             if installtype == 'mini':
                 remotepath = ('http://archive.ubuntu.com/ubuntu/dists/'
-                        '{series}/main/installer-{arch}/current/'
-                        'images/'.format(arch=arch, series=series))
+                              '{series}/main/installer-{arch}/current/'
+                              'images/'.format(arch=arch, series=series))
                 isopattern = 'netboot/mini.iso'
             else:
                 remotepath = ('http://releases.ubuntu.com/'
 
=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2012-12-06 16:30:34 +0000
+++ utah/isotest/iso_static_validation.py	2012-12-08 02:12:21 +0000
@@ -204,7 +204,7 @@
 
     # Test if the manfest is the same as that is given in the server
     @unittest.skipUnless(ubiquity_image,
-                        "manifest only for ubiquity based images")
+                         "manifest only for ubiquity based images")
     def test_manifest(self):
         manifest_url = os.path.join(self.url, 'current',
                                     self.st_release + '-' +
@@ -304,7 +304,7 @@
 
     # Test if the relevant important files are present in the iso for dvd iso
     @unittest.skipUnless(st_variant == 'dvd',
-                        "This file list test is only specific for dvd")
+                         "This file list test is only specific for dvd")
     def test_files_ubiquity_dvd(self):
         (stdout, stderr) = self.iso.listfiles()
         logging.debug('Check for error in extracting file list from the iso')
 
=== modified file 'utah/orderedcollections.py'
--- utah/orderedcollections.py	2012-12-03 14:02:18 +0000
+++ utah/orderedcollections.py	2012-12-08 02:12:21 +0000
@@ -26,7 +26,7 @@
 class OrderedSet(collections.MutableSet):
 
     def __init__(self, iterable=None):
-        self.end = end = [] 
+        self.end = end = []
         end += [None, end, end]         # sentinel node for doubly linked list
         self.map = {}                   # key --> [key, prev, next]
         if iterable is not None:
@@ -45,7 +45,7 @@
             curr[NEXT] = end[PREV] = self.map[key] = [key, curr, end]
 
     def discard(self, key):
-        if key in self.map:        
+        if key in self.map:
             key, prev, next = self.map.pop(key)
             prev[NEXT] = next
             next[PREV] = prev
 
=== modified file 'utah/process.py'
--- utah/process.py	2012-12-03 14:02:18 +0000
+++ utah/process.py	2012-12-08 02:12:21 +0000
@@ -23,11 +23,11 @@
     """
     Check all running process looking for a given pattern
     """
-    MESSAGE_TEMPLATE = \
-            ("{app} application is running.\n"
-            "Please stop it before launching utah since "
-            "it won't interact properly with KVM "
-            "(Kernel-based Virtual Machine)\n")
+    MESSAGE_TEMPLATE = (
+        "{app} application is running.\n"
+        "Please stop it before launching utah since "
+        "it won't interact properly with KVM "
+        "(Kernel-based Virtual Machine)\n")
 
     def check_cmdline(self, pattern):
         """
 
=== modified file 'utah/provisioning/baremetal/bamboofeeder.py'
--- utah/provisioning/baremetal/bamboofeeder.py	2012-12-06 16:30:34 +0000
+++ utah/provisioning/baremetal/bamboofeeder.py	2012-12-08 02:12:21 +0000
@@ -26,10 +26,10 @@
 
 from utah import config
 from utah.provisioning.provisioning import (
-        CustomInstallMixin,
-        Machine,
-        SSHMixin,
-        )
+    CustomInstallMixin,
+    Machine,
+    SSHMixin,
+)
 from utah.provisioning.baremetal.power import PowerMixin
 from utah.provisioning.baremetal.exceptions import UTAHBMProvisioningException
 from utah.retry import retry
@@ -45,7 +45,7 @@
         # TODO: respect rewrite setting
         if name is None:
             raise UTAHBMProvisioningException(
-                    'Machine name reqired for bamboo-feeder machine')
+                'Machine name reqired for bamboo-feeder machine')
         if powercmd is not None:
             self.powercmd = powercmd
         elif cargs is not None:
@@ -55,12 +55,12 @@
                     self.power[item] = cargs[item]
         else:
             raise UTAHBMProvisioningException(
-                    'No power control information specified')
+                'No power control information specified')
         try:
             self.macaddress = cargs['mac-address']
         except AttributeError:
             raise UTAHBMProvisioningException(
-                    'No MAC address specified')
+                'No MAC address specified')
         self.inventory = inventory
         super(BambooFeederMachine, self).__init__(*args, name=name, **kw)
         if self.inventory is not None:
@@ -68,7 +68,7 @@
         self._depcheck()
         if self.image is None:
             raise UTAHBMProvisioningException(
-                    'Image file required for bamboo-feeder installation')
+                'Image file required for bamboo-feeder installation')
         try:
             iface = config.wwwiface
         except AttributeError:
@@ -108,9 +108,10 @@
         self.imagedir = os.path.join(self.tmpdir, 'image.d')
         if not os.path.isdir(self.imagedir):
             os.makedirs(self.imagedir)
-        self.sector = int(subprocess.check_output(['file',
-                self.wwwimage]
-                ).strip().split(';')[1].split(',')[3].split()[1])
+        self.sector = int(
+            subprocess.check_output(
+                ['file', self.wwwimage]
+            ).strip().split(';')[1].split(',')[3].split()[1])
         self.logger.debug('Image start sector is ' + str(self.sector))
         self.cleanfunction(self._umountimage)
         self.logger.debug('Mounting ' + self.wwwimage + ' at ' +
@@ -167,15 +168,15 @@
         pipe.copy('/dev/null', initrd)
         self.logger.debug('Creating uInitrd with mkimage')
         self._runargs(['mkimage',
-                               '-A', 'arm',
-                               '-O', 'linux',
-                               '-T', 'ramdisk',
-                               '-C', 'gzip',
-                               '-a', '0',
-                               '-e', '0',
-                               '-n', 'initramfs',
-                               '-d', initrd,
-                               self.initrd])
+                       '-A', 'arm',
+                       '-O', 'linux',
+                       '-T', 'ramdisk',
+                       '-C', 'gzip',
+                       '-a', '0',
+                       '-e', '0',
+                       '-n', 'initramfs',
+                       '-d', initrd,
+                       self.initrd])
 
     def _umountimage(self):
         """
@@ -206,8 +207,7 @@
                           ('log_port', '10514'),
                           ('netcfg/choose_interface', 'auto'),
                           ('url', 'http://' + self.ip + '/utah/' + self.name +
-                           '.cfg'),
-                         ):
+                           '.cfg')):
             if parameter[0] not in self.cmdline:
                 self.logger.info('Adding boot option: ' + '='.join(parameter))
                 self.cmdline += ' ' + '='.join(parameter)
@@ -234,7 +234,7 @@
         open(tmppxefile, 'w').write(pxeconfig)
         self.logger.debug('PXE info written to ' + tmppxefile)
         pxefile = os.path.join(config.pxedir,
-                '01-' + self.macaddress.replace(':', '-'))
+                               '01-' + self.macaddress.replace(':', '-'))
         self.cleancommand(('sudo', 'rm', '-f', pxefile))
         self.logger.debug('Copying ' + tmppxefile + ' to ' + pxefile)
         self._runargs(['sudo', 'cp', tmppxefile, pxefile])
@@ -270,8 +270,7 @@
             self.logger.info('Configuring latecommand for desktop')
             myfile = open(os.path.join(self.tmpdir, 'initrd.d',
                           'utah-latecommand'), 'a')
-            myfile.write(
-"""
+            myfile.write("""
 chroot /target sh -c 'sed "/eth[0-9]/d" -i /etc/network/interfaces'
 """)
             myfile.close()
@@ -300,12 +299,13 @@
         if self.run(uuid_check_command)[0] != 0:
             self.provisioned = False
             raise UTAHBMProvisioningException(
-                    'Installed UUID differs from Machine UUID; '
-                    'installation probably failed. '
-                    'Try restarting cobbler or running cobbler sync')
+                'Installed UUID differs from Machine UUID; '
+                'installation probably failed. '
+                'Try restarting cobbler or running cobbler sync')
         self.logger.info('System installed')
-        self.cleanfunction(self.run, ('dd', 'bs=512k', 'count=10',
-                'if=/dev/zero', 'of=/dev/mmcblk0'), root=True)
+        self.cleanfunction(self.run, (
+            'dd', 'bs=512k', 'count=10', 'if=/dev/zero', 'of=/dev/mmcblk0'),
+            root=True)
         return True
 
     def _depcheck(self):
 
=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-12-06 16:30:34 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-12-08 02:12:21 +0000
@@ -26,10 +26,10 @@
 
 from utah import config
 from utah.provisioning.provisioning import (
-        CustomInstallMixin,
-        Machine,
-        SSHMixin,
-        )
+    CustomInstallMixin,
+    Machine,
+    SSHMixin,
+)
 from utah.provisioning.baremetal.exceptions import UTAHBMProvisioningException
 from utah.provisioning.baremetal.power import PowerMixin
 from utah.retry import retry
@@ -44,10 +44,10 @@
                  *args, **kw):
         if name is None:
             raise UTAHBMProvisioningException(
-                    'Machine name reqired for cobbler machine')
+                'Machine name reqired for cobbler machine')
         if cargs is None:
             raise UTAHBMProvisioningException(
-                    'No cobbler arguments given for machine creation')
+                'No cobbler arguments given for machine creation')
         else:
             self.cargs = cargs
         self.power = {}
@@ -61,7 +61,7 @@
                                              preseed=preseed, **kw)
         if self.image is None:
             raise UTAHBMProvisioningException(
-                    'Image file required for cobbler installation')
+                'Image file required for cobbler installation')
         self._custominit()
         # TODO: verify we have nfs support for desktop image
 
@@ -106,8 +106,7 @@
             self.logger.info('Configuring latecommand for desktop')
             myfile = open(os.path.join(self.tmpdir, 'initrd.d',
                           'utah-latecommand'), 'a')
-            myfile.write(
-"""
+            myfile.write("""
 chroot /target sh -c 'sed "/eth[0-9]/d" -i /etc/network/interfaces'
 """)
             myfile.close()
@@ -152,7 +151,7 @@
             pipe.append('sudo tee -a ' + str(config.nfsconfigfile) +
                         ' >/dev/null', '-.')
             pipe.open('/dev/null', 'w').write(self.tmpdir + ' ' +
-                      config.nfsoptions + "\n")
+                                              config.nfsoptions + "\n")
             self.logger.debug('Reloading NFS config')
             self._runargs(config.nfscommand)
             self.logger.debug('Adding NFS boot options')
@@ -176,8 +175,8 @@
         self.logger.info('Adding system')
         self._cobble(['system', 'add', '--name=' + self.name,
                       '--profile=' + self.cname, '--netboot-enabled=Y']
-                      + ['--' + arg + '=' + self.cargs[arg]
-                         for arg in self.cargs])
+                     + ['--' + arg + '=' + self.cargs[arg]
+                        for arg in self.cargs])
 
         # Things seem to be working fine without this,
         # but sometimes things still get broken
@@ -219,9 +218,9 @@
         if self.run(uuid_check_command)[0] != 0:
             self.provisioned = False
             raise UTAHBMProvisioningException(
-                    'Installed UUID differs from CobblerMachine UUID; '
-                    'installation probably failed. '
-                    'Try restarting cobbler or running cobbler sync')
+                'Installed UUID differs from CobblerMachine UUID; '
+                'installation probably failed. '
+                'Try restarting cobbler or running cobbler sync')
         self.logger.info('System installed')
         return True
 
 
=== modified file 'utah/provisioning/baremetal/power.py'
--- utah/provisioning/baremetal/power.py	2012-12-03 14:02:18 +0000
+++ utah/provisioning/baremetal/power.py	2012-12-08 02:12:21 +0000
@@ -72,4 +72,3 @@
         self.logger.debug('Waiting ' + str(config.powertimeout) + ' seconds')
         time.sleep(config.powertimeout)
         self._start()
-
 
=== modified file 'utah/provisioning/inventory/inventory.py'
--- utah/provisioning/inventory/inventory.py	2012-12-03 15:49:35 +0000
+++ utah/provisioning/inventory/inventory.py	2012-12-08 02:12:21 +0000
@@ -17,7 +17,7 @@
 
 import os
 from utah.provisioning.inventory.exceptions import \
-        UTAHProvisioningInventoryException
+    UTAHProvisioningInventoryException
 
 
 class Inventory(object):
@@ -50,9 +50,9 @@
             lockfile.close()
             if inventory != userinventory:
                 raise UTAHProvisioningInventoryException(
-                        'Different inventory in use: ' + userinventory
-                        + "\nDelete " + self.lockfile
-                        + ' if you are sure it is no longer valid')
+                    'Different inventory in use: ' + userinventory
+                    + "\nDelete " + self.lockfile
+                    + ' if you are sure it is no longer valid')
         else:
             lockfile = open(self.lockfile, 'w')
             lockfile.write(inventory)
@@ -91,7 +91,7 @@
         send all arguments to that constructor.
         """
         raise UTAHProvisioningInventoryException(
-                'Method not defined for this inventory')
+            'Method not defined for this inventory')
 
     def release(self):
         """
 
=== modified file 'utah/provisioning/inventory/sqlite.py'
--- utah/provisioning/inventory/sqlite.py	2012-12-03 15:49:35 +0000
+++ utah/provisioning/inventory/sqlite.py	2012-12-08 02:12:21 +0000
@@ -19,7 +19,7 @@
 import os
 import psutil
 from utah.provisioning.inventory.exceptions import \
-        UTAHProvisioningInventoryException
+    UTAHProvisioningInventoryException
 from utah.provisioning.inventory.inventory import Inventory
 from utah.provisioning.vm.libvirtvm import CustomVM
 from utah.provisioning.baremetal.cobbler import CobblerMachine
@@ -55,8 +55,8 @@
         """
         super(TinySQLiteInventory, self).__init__(*args, **kw)
         self.connection.execute(
-                'CREATE TABLE IF NOT EXISTS '
-                'machines(machineid INTEGER PRIMARY KEY, state TEXT)')
+            'CREATE TABLE IF NOT EXISTS '
+            'machines(machineid INTEGER PRIMARY KEY, state TEXT)')
 
     def request(self, machinetype=CustomVM, *args, **kw):
         """
@@ -106,9 +106,10 @@
         lockfile = os.path.expanduser(lockfile)
         if not os.path.isfile(db):
             raise UTAHProvisioningInventoryException(
-                    'No machine database found at ' + db)
+                'No machine database found at ' + db)
         super(ManualCobblerSQLiteInventory, self).__init__(*args, db=db,
-                                                 lockfile=lockfile, **kw)
+                                                           lockfile=lockfile,
+                                                           **kw)
         machines_count = (self.connection
                           .execute('SELECT COUNT(*) FROM machines')
                           .fetchall()[0][0])
@@ -125,7 +126,7 @@
         result = self.connection.execute(query, queryvars).fetchall()
         if result is None:
             raise UTAHProvisioningInventoryException(
-                    'No machines meet criteria')
+                'No machines meet criteria')
         else:
             for machineinfo in result:
                 cargs = dict(machineinfo)
@@ -135,16 +136,16 @@
                 cargs = dict(machineinfo)
                 pid = cargs['pid']
                 try:
-                    if not (psutil.pid_exists(pid) and ('utah' in 
+                    if not (psutil.pid_exists(pid) and ('utah' in
                             ' '.join(psutil.Process(pid).cmdline)
-                            or 'run_test_cobbler.py' in 
+                            or 'run_test_cobbler.py' in
                             ' '.join(psutil.Process(pid).cmdline))):
                         return self._take(cargs, *args, **kw)
                 except ValueError:
                     continue
 
         raise UTAHProvisioningInventoryException(
-                'All machines meeting criteria are currently unavailable')
+            'All machines meeting criteria are currently unavailable')
 
     def _take(self, cargs, *args, **kw):
         machineid = cargs.pop('machineid')
@@ -152,33 +153,34 @@
         state = cargs.pop('state')
         pid = cargs.pop('pid')
         update = self.connection.execute(
-                "UPDATE machines SET pid=?, state='provisioned' WHERE machineid=? AND state=?",
-                [os.getpid(), machineid, state]).rowcount
+            "UPDATE machines SET pid=?, state='provisioned' WHERE machineid=?"
+            "AND state=?",
+            [os.getpid(), machineid, state]).rowcount
         if update == 1:
             machine = CobblerMachine(*args, cargs=cargs,
-                    inventory=self, name=name, **kw)
+                                     inventory=self, name=name, **kw)
             self.machines.append(machine)
             return machine
         elif update == 0:
             raise UTAHProvisioningInventoryException(
-                    'Machine was requested by another process '
-                    'before we could request it')
+                'Machine was requested by another process '
+                'before we could request it')
         elif update > 1:
             raise UTAHProvisioningInventoryException(
-                    'Multiple machines exist '
-                    'matching those criteria; '
-                    'database ' + self.db + ' may be corrupt')
+                'Multiple machines exist '
+                'matching those criteria; '
+                'database ' + self.db + ' may be corrupt')
         else:
             raise UTAHProvisioningInventoryException(
-                    'Negative rowcount returned '
-                    'when attempting to request machine')
+                'Negative rowcount returned '
+                'when attempting to request machine')
 
     def release(self, machine=None, name=None):
         if machine is not None:
             name = machine.name
         if name is None:
             raise UTAHProvisioningInventoryException(
-                    'name required to release a machine')
+                'name required to release a machine')
         query = "UPDATE machines SET state='available' WHERE name=?"
         queryvars = [name]
         update = self.connection.execute(query, queryvars).rowcount
@@ -188,17 +190,17 @@
                     self.machines.remove(machine)
         elif update == 0:
             raise UTAHProvisioningInventoryException(
-                    'SERIOUS ERROR: Another process released this machine '
-                    'before we could, which means two processes provisioned '
-                    'the same machine simultaneously')
+                'SERIOUS ERROR: Another process released this machine '
+                'before we could, which means two processes provisioned '
+                'the same machine simultaneously')
         elif update > 1:
             raise UTAHProvisioningInventoryException(
-                    'Multiple machines exist matching those criteria; '
-                    'database ' + self.db + ' may be corrupt')
+                'Multiple machines exist matching those criteria; '
+                'database ' + self.db + ' may be corrupt')
         else:
             raise UTAHProvisioningInventoryException(
-                    'Negative rowcount returned '
-                    'when attempting to release machine')
+                'Negative rowcount returned '
+                'when attempting to release machine')
 
     # Here is how I currently create the database:
     # CREATE TABLE machines (machineid INTEGER PRIMARY KEY,
 
=== modified file 'utah/publish.py'
--- utah/publish.py	2012-12-03 14:02:18 +0000
+++ utah/publish.py	2012-12-08 02:12:21 +0000
@@ -47,41 +47,41 @@
         'runlist': {
             'type': 'string',
             'required': True,
-            },
+        },
         'commands': {
             'type': 'array',
             'items': {'type': COMMAND_SCHEMA},
             'required': True,
-            },
+        },
         'fetch_errors': {
             'type': 'integer',
             'required': True,
-            },
+        },
         'errors': {
             'type': 'integer',
             'required': True,
-            },
+        },
         'failures': {
             'type': 'integer',
             'required': True,
-            },
+        },
         'passes': {
             'type': 'integer',
             'required': True,
-            },
+        },
         'uname': {
             'type': 'array',
             'items': {'type': 'string'},
             'required': True,
-            },
+        },
         'media-info': {
             'type': 'string',
             'required': True,
-            },
+        },
         'install_type': {
             'type': 'string',
             'required': True,
-            },
+        },
     },
 }
 
@@ -135,7 +135,7 @@
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-            description='utah results publisher'
+        description='utah results publisher'
     )
     parser.add_argument('logfile', metavar='LOGFILE', type=str,
                         help="utah client results log")
 
=== modified file 'utah/timeout.py'
--- utah/timeout.py	2012-12-03 14:02:18 +0000
+++ utah/timeout.py	2012-12-08 02:12:21 +0000
@@ -53,8 +53,9 @@
             try:
                 return command(*args, **kw)
             except UTAHTimeout:
-                raise UTAHTimeout(commandstr(command, *args, **kw)
-                        + ' timed out after ' + str(timeout) + ' seconds')
+                raise UTAHTimeout(
+                    commandstr(command, *args, **kw)
+                    + ' timed out after ' + str(timeout) + ' seconds')
         else:
             signal.signal(signal.SIGALRM, alarm_handler)
             signal.alarm(timeout)
@@ -64,8 +65,9 @@
                     signal.alarm(0)
                 return retval
             except UTAHTimeout:
-                raise UTAHTimeout(commandstr(command, *args, **kw)
-                        + ' timed out after ' + str(timeout) + ' seconds')
+                raise UTAHTimeout(
+                    commandstr(command, *args, **kw)
+                    + ' timed out after ' + str(timeout) + ' seconds')
 
 
 def subprocesstimeout(timeout, *args, **kw):