Merge lp:~javier.collado/utah/static_anaysis_fixes_2 into lp:utah

[Javier Collado]

More static analysis fixes.

This time, the work on breaking up long lines has started. I hope you agree on trying to avoid long lines as much as possible.

[Max Brustkern (nuclearbob)]

I haven't been trying as hard as I could be. I'll try harder.

There are two spots here I'm concerned about:

326 - output = "total: %d, passes: %d, failure: %d, error: %d" % (tests_run, self.passes, self.failures, self.errors + self.fetch_errors)
327 + output = ("total: %d, passes: %d, failure: %d, error: %d"
328 + % (tests_run, self.passes, self.failures,
329 + self.errors + self.fetch_errors))

493 - return "%s: %s, %s, %s" % (self.name, self.description, self.command, self.timeout)
494 + return ("%s: %s, %s, %s"
495 + % (self.name, self.description, self.command, self.timeout))

Is this going to turn what was a string into a tuple containing a string? If you've run the client with these changes and it works, then we're fine, I just don't know the client code as well.

review: Needs Information

[Javier Collado (javier.collado)]

Yes, I've run the client and didn't get any problem.

Anyway, this kind of use of parentheses is fine since they are only grouping things from different lines into one statement. Unless a comma is added before the closing parenthesis, this won't be transformed into a one element tuple.

[Max Brustkern (nuclearbob)]

All right, good to know, thanks.

review: Approve

=== modified file 'examples/run_install_test.py'
--- examples/run_install_test.py	2012-07-18 13:48:03 +0000
+++ examples/run_install_test.py	2012-07-20 10:57:30 +0000
@@ -14,24 +14,53 @@
 
 
 def get_parser():
-    parser = argparse.ArgumentParser(description='Provision a machine and run one or more UTAH runlists there.', epilog="For example:\n\t%(prog)s -s oneiric -t server -a i386 /usr/share/utah/client/examples/master.run '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('-m', '--machinetype', choices=('physical', 'virtual'), default='virtual', help='Type of machine to provision')
-    parser.add_argument('-e', '--emulator', help='Emulator to use (kvm and qemu are supported, kvm will be favored if available)')
-    parser.add_argument('-i', '--image', help='Image/ISO file to use for installation')
-    parser.add_argument('-k', '--kernel', help='Kernel file to use for installation')
-    parser.add_argument('-r', '--initrd', help='InitRD file to use for installation')
-    parser.add_argument('-p', '--preseed', help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot', help='Boot arguments for initial installation')
-    parser.add_argument('-x', '--xml', help='XML VM definition file')
-    parser.add_argument('-g', '--gigabytes', action='append', help='Size in gigabytes of virtual disk, specify more than once for multiple disks')
-    parser.add_argument('-s', '--series', choices=('hardy', 'lucid', 'natty', 'oneiric', 'precise', 'quantal'), help='Series to use for installation')
-    parser.add_argument('-t', '--type', choices=('desktop', 'server', 'mini', 'alternate'), help='Install type to use for installation')
-    parser.add_argument('-a', '--arch', choices=('i386', 'amd64', 'arm'), help='Architecture to use for installation')
-    parser.add_argument('-v', '--variant', help='Variant of architecture, i.e., armel, armhf')
-    parser.add_argument('-n', '--no-destroy', action='store_true', help='Preserve machine after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true', help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true', help='Enable json logging (Default is YAML)')
+    parser = argparse.ArgumentParser(
+            description=('Provision a machine '
+                         'and run one or more UTAH runlists there.'),
+            epilog=("For example:\n"
+                    "\t%(prog)s -s oneiric -t server -a i386 "
+                    "/usr/share/utah/client/examples/master.run "
+                    "'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('-m', '--machinetype', choices=('physical', 'virtual'),
+                        default='virtual', help='Type of machine to provision')
+    parser.add_argument('-e', '--emulator',
+                        help=('Emulator to use (kvm and qemu are supported, '
+                              'kvm will be favored if available)'))
+    parser.add_argument('-i', '--image',
+                        help='Image/ISO file to use for installation')
+    parser.add_argument('-k', '--kernel',
+                        help='Kernel file to use for installation')
+    parser.add_argument('-r', '--initrd',
+                        help='InitRD file to use for installation')
+    parser.add_argument('-p', '--preseed',
+                        help='Preseed file to use for installation')
+    parser.add_argument('-b', '--boot',
+                        help='Boot arguments for initial installation')
+    parser.add_argument('-x', '--xml',
+                        help='XML VM definition file')
+    parser.add_argument('-g', '--gigabytes', action='append',
+                        help=('Size in gigabytes of virtual disk, '
+                              'specify more than once for multiple disks'))
+    parser.add_argument('-s', '--series',
+                        choices=('hardy', 'lucid', 'natty',
+                                 'oneiric', 'precise', 'quantal'),
+                        help='Series to use for installation')
+    parser.add_argument('-t', '--type',
+                        choices=('desktop', 'server', 'mini', 'alternate'),
+                        help='Install type to use for installation')
+    parser.add_argument('-a', '--arch', choices=('i386', 'amd64', 'arm'),
+                        help='Architecture to use for installation')
+    parser.add_argument('-v', '--variant',
+                        help='Variant of architecture, i.e., armel, armhf')
+    parser.add_argument('-n', '--no-destroy', action='store_true',
+                        help='Preserve machine after tests have run')
+    parser.add_argument('-d', '--debug', action='store_true',
+                        help='Enable debug logging')
+    parser.add_argument('-j', '--json', action='store_true',
+                        help='Enable json logging (Default is YAML)')
     return parser
 
 
@@ -56,7 +85,12 @@
 
     try:
         inventory = utah.provisioning.inventory.TinySQLiteInventory()
-        machine = inventory.request(utah.provisioning.vm.CustomVM, arch=args.arch, boot=args.boot, debug=args.debug, 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, series=args.series, xml=args.xml)
+        machine = inventory.request(utah.provisioning.vm.CustomVM,
+                arch=args.arch, boot=args.boot, debug=args.debug,
+                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, series=args.series, xml=args.xml)
         for logger in [machine.logger] + machine.logger.handlers:
             if logger.level > logging.INFO:
                 logger.setLevel(logging.INFO)
@@ -64,11 +98,19 @@
         for runlist in args.runlists:
             locallist = urllib.urlretrieve(runlist)[0]
             listname = os.path.split(runlist)[1]
-            remotelog = os.path.normpath(os.path.join(config.logpath, machine.name + '_' + listname + '_tmp'))
-            locallog = os.path.normpath(os.path.join(config.logpath, machine.name + '_' + listname + time.strftime('_%Y-%m-%d_%H-%m-%S', time.gmtime()) + suffix))
+            remotelog = os.path.join(config.logpath,
+                    machine.name + '_' + listname + '_tmp')
+            remotelog = os.path.normpath(remotelog)
+            locallog = os.path.join(config.logpath,
+                    machine.name + '_' + listname
+                    + time.strftime('_%Y-%m-%d_%H-%m-%S', time.gmtime())
+                    + suffix)
+            locallog = os.path.normpath(locallog)
             try:
                 machine.uploadfiles([locallist], os.path.normpath('/tmp'))
-                machine.run('utah' + extraopts + ' -r /tmp/' + os.path.split(locallist)[1] + ' -o ' + remotelog, root=True)
+                options = (' -r /tmp/' + os.path.split(locallist)[1]
+                           + ' -o ' + remotelog)
+                machine.run('utah' + extraopts + options, root=True)
                 machine.downloadfiles([remotelog], locallog)
                 print('Test log copied to ' + locallog)
                 locallogs.append(locallog)

=== modified file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2012-07-18 13:48:03 +0000
+++ examples/run_test_vm.py	2012-07-20 10:57:30 +0000
@@ -14,14 +14,34 @@
 
 
 def get_parser():
-    parser = argparse.ArgumentParser(description='Create a virtual machine and run a UTAH runlist there.', epilog="For example:\n\t%(prog)s -s oneiric -t server -a i386 /usr/share/utah/client/examples/master.run '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', choices=('hardy', 'lucid', 'natty', 'oneiric', 'precise', 'quantal'), default='oneiric', help='Series to use for VM creation')
-    parser.add_argument('-t', '--type', choices=('desktop', 'server', 'mini', 'alternate'), default='server', help='Install type to use for VM creation')
-    parser.add_argument('-a', '--arch', choices=('i386', 'amd64'), default='i386', help='Architecture to use for VM creation')
-    parser.add_argument('-n', '--no-destroy', action='store_true', help='Preserve VM after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true', help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true', help='Enable json logging (Default is YAML)')
+    parser = argparse.ArgumentParser(
+            description=('Create a virtual machine '
+                         'and run a UTAH runlist there.'),
+            epilog=("For example:\n"
+                    "\t%(prog)s -s oneiric -t server -a i386 "
+                    "/usr/share/utah/client/examples/master.run "
+                    "'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',
+                        choices=('hardy', 'lucid', 'natty',
+                                 'oneiric', 'precise', 'quantal'),
+                        default='oneiric',
+                        help='Series to use for VM creation')
+    parser.add_argument('-t', '--type',
+                        choices=('desktop', 'server', 'mini', 'alternate'),
+                        default='server',
+                        help='Install type to use for VM creation')
+    parser.add_argument('-a', '--arch', choices=('i386', 'amd64'),
+                        default='i386',
+                        help='Architecture to use for VM creation')
+    parser.add_argument('-n', '--no-destroy', action='store_true',
+                        help='Preserve VM after tests have run')
+    parser.add_argument('-d', '--debug', action='store_true',
+                        help='Enable debug logging')
+    parser.add_argument('-j', '--json', action='store_true',
+                        help='Enable json logging (Default is YAML)')
     return parser
 
 
@@ -53,7 +73,8 @@
                 kw.update([(arg, value)])
         if args.type is not None:
             kw.update([('installtype', args.type)])
-        machine = inventory.request(debug=args.debug, new=True, dlpercentincrement=10, **kw)
+        machine = inventory.request(debug=args.debug, new=True,
+                                    dlpercentincrement=10, **kw)
         for logger in [machine.logger] + machine.logger.handlers:
             if logger.level > logging.INFO:
                 logger.setLevel(logging.INFO)
@@ -61,11 +82,19 @@
         for runlist in args.runlists:
             locallist = urllib.urlretrieve(runlist)[0]
             listname = os.path.split(runlist)[1]
-            remotelog = os.path.normpath(os.path.join(config.logpath, machine.name + '_' + listname + '_tmp'))
-            locallog = os.path.normpath(os.path.join(config.logpath, machine.name + '_' + listname + time.strftime('_%Y-%m-%d_%H-%m-%S', time.gmtime()) + suffix))
+            remotelog = os.path.join(config.logpath,
+                    machine.name + '_' + listname + '_tmp')
+            remotelog = os.path.normpath(remotelog)
+            locallog = os.path.join(config.logpath,
+                    machine.name + '_' + listname
+                    + time.strftime('_%Y-%m-%d_%H-%m-%S', time.gmtime())
+                    + suffix)
+            locallog = os.path.normpath(locallog)
             try:
                 machine.uploadfiles([locallist], os.path.normpath('/tmp'))
-                machine.run('utah' + extraopts + ' -r /tmp/' + os.path.split(locallist)[1] + ' -o ' + remotelog, root=True)
+                options = (' -r /tmp/' + os.path.split(locallist)[1]
+                           + ' -o ' + remotelog)
+                machine.run('utah' + extraopts + options, root=True)
                 machine.downloadfiles([remotelog], locallog)
                 print('Test log copied to ' + locallog)
                 locallogs.append(locallog)

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-07-19 09:05:22 +0000
+++ examples/run_utah_tests.py	2012-07-20 10:57:30 +0000
@@ -9,24 +9,53 @@
 
 
 def get_parser():
-    parser = argparse.ArgumentParser(description='Provision a machine and run one or more UTAH runlists there.', epilog="For example:\n\t%(prog)s -s oneiric -t server -a i386 /usr/share/utah/client/examples/master.run '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', choices=('physical', 'virtual'), default='virtual', help='Type of machine to provision')
-    parser.add_argument('-e', '--emulator', help='Emulator to use (kvm and qemu are supported, kvm will be favored if available)')
-    parser.add_argument('-i', '--image', type=url_argument, help='Image/ISO file to use for installation')
-    parser.add_argument('-k', '--kernel', type=url_argument, help='Kernel file to use for installation')
-    parser.add_argument('-r', '--initrd', type=url_argument, help='InitRD file to use for installation')
-    parser.add_argument('-p', '--preseed', type=url_argument, help='Preseed file to use for installation')
-    parser.add_argument('-b', '--boot', help='Boot arguments for initial installation')
-    parser.add_argument('-x', '--xml', type=url_argument, help='XML VM definition file')
-    parser.add_argument('-g', '--gigabytes', action='append', help='Size in gigabytes of virtual disk, specify more than once for multiple disks')
-    parser.add_argument('-s', '--series', choices=('hardy', 'lucid', 'natty', 'oneiric', 'precise', 'quantal'), help='Series to use for installation')
-    parser.add_argument('-t', '--type', choices=('desktop', 'server', 'mini', 'alternate'), help='Install type to use for installation')
-    parser.add_argument('-a', '--arch', choices=('i386', 'amd64', 'arm'), help='Architecture to use for installation')
-    parser.add_argument('-v', '--variant', help='Variant of architecture, i.e., armel, armhf')
-    parser.add_argument('-n', '--no-destroy', action='store_true', help='Preserve machine after tests have run')
-    parser.add_argument('-d', '--debug', action='store_true', help='Enable debug logging')
-    parser.add_argument('-j', '--json', action='store_true', help='Enable json logging (Default is YAML)')
+    parser = argparse.ArgumentParser(
+            description=('Provision a machine '
+                         'and run one or more UTAH runlists there.'),
+            epilog=("For example:\n"
+                    "\t%(prog)s -s oneiric -t server -a i386 "
+                    "/usr/share/utah/client/examples/master.run "
+                    "'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', choices=('physical', 'virtual'),
+                        default='virtual', help='Type of machine to provision')
+    parser.add_argument('-e', '--emulator',
+                        help=('Emulator to use (kvm and qemu are supported, '
+                              'kvm will be favored if available)'))
+    parser.add_argument('-i', '--image', type=url_argument,
+                        help='Image/ISO file to use for installation')
+    parser.add_argument('-k', '--kernel', type=url_argument,
+                        help='Kernel file to use for installation')
+    parser.add_argument('-r', '--initrd', type=url_argument,
+                        help='InitRD file to use for installation')
+    parser.add_argument('-p', '--preseed', type=url_argument,
+                        help='Preseed file to use for installation')
+    parser.add_argument('-b', '--boot',
+                        help='Boot arguments for initial installation')
+    parser.add_argument('-x', '--xml', type=url_argument,
+                        help='XML VM definition file')
+    parser.add_argument('-g', '--gigabytes', action='append',
+                        help=('Size in gigabytes of virtual disk, '
+                              'specify more than once for multiple disks'))
+    parser.add_argument('-s', '--series',
+                        choices=('hardy', 'lucid', 'natty',
+                                 'oneiric', 'precise', 'quantal'),
+                        help='Series to use for installation')
+    parser.add_argument('-t', '--type',
+                        choices=('desktop', 'server', 'mini', 'alternate'),
+                        help='Install type to use for installation')
+    parser.add_argument('-a', '--arch', choices=('i386', 'amd64', 'arm'),
+                        help='Architecture to use for installation')
+    parser.add_argument('-v', '--variant',
+                        help='Variant of architecture, i.e., armel, armhf')
+    parser.add_argument('-n', '--no-destroy', action='store_true',
+                        help='Preserve machine after tests have run')
+    parser.add_argument('-d', '--debug', action='store_true',
+                        help='Enable debug logging')
+    parser.add_argument('-j', '--json', action='store_true',
+                        help='Enable json logging (Default is YAML)')
     return parser
 
 
@@ -39,18 +68,22 @@
         args = get_parser().parse_args()
 
     if args.machinetype == 'physical':
-        sys.stderr.write("Physical machine provisioning is not supported in this release.\n")
-        sys.stderr.write("Please check the roadmap, as it will be included in a future version.\n")
+        sys.stderr.write("Physical machine provisioning is not supported "
+                         "in this release.\n")
+        sys.stderr.write("Please check the roadmap, "
+                         "as it will be included in a future version.\n")
         sys.exit(4)
 
     if args.arch is not None and 'arm' in args.arch:
         sys.stderr.write("ARM support is not included in this release.\n")
-        sys.stderr.write("Please check the roadmap, as it will be included in a future version.\n")
+        sys.stderr.write("Please check the roadmap, "
+                         "as it will be included in a future version.\n")
         sys.exit(4)
 
     function = run_test_vm
 
-    for option in [args.boot, args.emulator, args.image, args.initrd, args.kernel, args.preseed, args.xml]:
+    for option in [args.boot, args.emulator, args.image, args.initrd,
+                   args.kernel, args.preseed, args.xml]:
         if option is not None:
             from run_install_test import run_install_test
             function = run_install_test

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2012-07-18 13:48:03 +0000
+++ utah/client/runner.py	2012-07-20 10:57:30 +0000
@@ -80,7 +80,8 @@
 
     def reset_rc_local(self):
         """
-        Restore original /etc/rc.local if there is a backup otherwise remove it.
+        Restore original /etc/rc.local if there is a backup
+        Otherwise remove it.
         """
 
         # Ignore permission denied errors since we only care if a reboot is
@@ -250,8 +251,9 @@
             # Create a TestSuite
             # TODO: pass master.run overrides into the test suite.
             s = TestSuite(name=name, runlist_file=suite_runlist,
-                          includes=includes, excludes=excludes, result=self.result,
-                          path=self.testdir, _save_state_callback=self.save_state,
+                          includes=includes, excludes=excludes,
+                          result=self.result, path=self.testdir,
+                          _save_state_callback=self.save_state,
                           _reboot_callback=self.reboot)
             self.add_suite(s)
 
@@ -311,7 +313,9 @@
     def report(self):
         tests_run = self.passes + self.errors + self.failures
 
-        output = "total: %d, passes: %d, failure: %d, error: %d" % (tests_run, self.passes, self.failures, self.errors + self.fetch_errors)
+        output = ("total: %d, passes: %d, failure: %d, error: %d"
+                  % (tests_run, self.passes, self.failures,
+                     self.errors + self.fetch_errors))
 
         if self.errors > 0 or self.fetch_errors > 0:
             result = "ERROR"

=== modified file 'utah/client/self_test.py'
--- utah/client/self_test.py	2012-07-18 13:48:03 +0000
+++ utah/client/self_test.py	2012-07-20 10:57:30 +0000
@@ -135,7 +135,9 @@
         """
         Use the 'examples' test suite that's part of the UTAH package.
         """
-        self.suite = testsuite.TestSuite(name='examples', path='/var/lib/utah', result_class=ResultYAML,
+        self.suite = testsuite.TestSuite(name='examples',
+                                         path='/var/lib/utah',
+                                         result_class=ResultYAML,
                                          _save_state_callback=state_saver)
 
     def test_run(self):
@@ -369,7 +371,9 @@
     def test_fetch_failed(self):
         print "Starting test"
         # exit 2 should be flagged as an error.
-        bad_runlist_content = """---\n- name: fake_tests\n  fetch_cmd: exit 2\n"""
+        bad_runlist_content = ('---\n'
+                               '- name: fake_tests\n'
+                               '  fetch_cmd: exit 2\n')
         runlist = '/tmp/master_fetch_fails.run'
 
         self.assertFalse(os.path.exists(runlist), runlist)
@@ -411,9 +415,10 @@
         """
         Test that the runner fails gracefully on missing testdir.
         """
-
         self.assertRaises(exceptions.BadDir,
-                          Runner, result_class=self.result_class, testdir=self.bad_dir)
+                          Runner,
+                          result_class=self.result_class,
+                          testdir=self.bad_dir)
 
     def test_missing_master_runlist(self):
         """
@@ -430,7 +435,9 @@
             os.remove(tmp_master_runlist)
 
         self.assertRaises(exceptions.MissingFile,
-                          Runner, result_class=self.result_class, testdir=self.bad_dir)
+                          Runner,
+                          result_class=self.result_class,
+                          testdir=self.bad_dir)
 
     def test_runlist(self):
         """
@@ -477,9 +484,15 @@
             raise Exception("didn't print with CONFIG['DEBUG'] set to True")
 
         CONFIG['DEBUG'] = False
-        self.assertEqual(debug_print("shouldn't be printed unless common.CONFIG['DEBUG'] is True"), CONFIG['DEBUG'], "printed with CONFIG['DEBUG'] set to False")
 
-        self.assertEqual(debug_print("should be printed (using 'force=True')", force=True), True)
+        debug = debug_print("shouldn't be printed "
+                            "unless common.CONFIG['DEBUG'] is True")
+        self.assertEqual(debug,
+                         CONFIG['DEBUG'],
+                         "printed with CONFIG['DEBUG'] set to False")
+        debug = debug_print("should be printed (using 'force=True')",
+                            force=True)
+        self.assertEqual(debug, True)
 
         CONFIG['DEBUG'] = old_debug
 
@@ -497,10 +510,12 @@
         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(result_class=ResultYAML, state_agent=self.state_agent)
+        self.runner = Runner(result_class=ResultYAML,
+                             state_agent=self.state_agent)
         self.partial_state_file_content = partial_state_file_content
 
     def tearDown(self):
@@ -523,11 +538,13 @@
     def test_cleanup(self):
         self.runner.save_state()
 
-        self.assertTrue(os.path.exists(self.state_file), "Runner failed to save state")
+        self.assertTrue(os.path.exists(self.state_file),
+                        "Runner failed to save state")
 
         self.state_agent.clean()
 
-        self.assertFalse(os.path.exists(self.state_file), "Failed to remove state file (%s)" % self.state_file)
+        self.assertFalse(os.path.exists(self.state_file),
+                         "Failed to remove state file (%s)" % self.state_file)
 
     def test_status(self):
         """
@@ -559,9 +576,13 @@
         fp.write(self.partial_state_file_content)
         fp.close()
 
-        run_cmd('cp -r /usr/share/utah/client/examples/utah_tests /var/lib/utah/utah_tests/ #JAT')
+        run_cmd('cp -r '
+                '/usr/share/utah/client/examples/utah_tests '
+                '/var/lib/utah/utah_tests/ #JAT')
 
-        run_cmd('cp -r /usr/share/utah/client/examples/utah_tests_sample /var/lib/utah/utah_tests_sample/ #JAT')
+        run_cmd('cp -r '
+                '/usr/share/utah/client/examples/utah_tests_sample '
+                '/var/lib/utah/utah_tests_sample/ #JAT')
 
         state_agent = StateAgentYAML(state_file=self.state_file)
         runner = Runner(state_agent=state_agent, resume=True)

=== modified file 'utah/client/state_agent.py'
--- utah/client/state_agent.py	2012-07-18 13:48:03 +0000
+++ utah/client/state_agent.py	2012-07-20 10:57:30 +0000
@@ -60,8 +60,8 @@
         """
         Output the state as YAML.
         """
-
-        super(StateAgentYAML, self).save_state(yaml.dump(state, default_flow_style=False))
+        yaml_state = yaml.dump(state, default_flow_style=False)
+        super(StateAgentYAML, self).save_state(yaml_state)
 
     def load_state(self):
         """

=== modified file 'utah/client/testcase.py'
--- utah/client/testcase.py	2012-07-18 11:09:47 +0000
+++ utah/client/testcase.py	2012-07-20 10:57:30 +0000
@@ -25,7 +25,8 @@
     type = 'userland'
 
     def __init__(self, name, path, command=None, result=None, timeout=0,
-                 _control_data=None, _save_state_callback=None, _reboot_callback=None):
+                 _control_data=None, _save_state_callback=None,
+                 _reboot_callback=None):
         """
         Build a TestCase from a control file's data.
 
@@ -59,8 +60,9 @@
         import os
         if _control_data is None:
             if os.path.exists(self.filename):
-                control_data = parse_control_file(self.filename, required=required_items,
-                                              optional=optional_items)
+                control_data = parse_control_file(self.filename,
+                                                  required=required_items,
+                                                  optional=optional_items)
             else:
                 raise MissingFile(self.filename)
         else:
@@ -76,7 +78,8 @@
             self.command = command
 
     def __str__(self):
-        return "%s: %s, %s, %s" % (self.name, self.description, self.command, self.timeout)
+        return ("%s: %s, %s, %s"
+                % (self.name, self.description, self.command, self.timeout))
 
     def set_status(self, status):
         """
@@ -142,13 +145,17 @@
             timeout = self.timeout or 0
             self.status = "RUN"
             self.save_state_callback()
-            result.add_result(run_cmd(self.command, timeout=timeout, cwd=self.working_dir))
+            result.add_result(run_cmd(self.command,
+                                      timeout=timeout,
+                                      cwd=self.working_dir))
 
         # Clean up whether 'command' failed or not.
         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
 
         self.run_status = result.result()

=== modified file 'utah/client/testsuite.py'
--- utah/client/testsuite.py	2012-07-18 11:09:47 +0000
+++ utah/client/testsuite.py	2012-07-20 10:57:30 +0000
@@ -34,7 +34,8 @@
     ts_setup = None
     ts_cleanup = None
     control_file = None
-    # status is one of 'NOTRUN', 'BUILD', 'SETUP', 'INPROGRESS', 'CLEANUP', and 'DONE'
+    # status is one of:
+    # 'NOTRUN', 'BUILD', 'SETUP', 'INPROGRESS', 'CLEANUP', and 'DONE'
     status = "NOTRUN"
     save_state_callback = do_nothing
 
@@ -50,7 +51,8 @@
         self.failures = 0
         self.errors = 0
 
-        # work from within the testsuite's directory. eg. /var/lib/utah/examples
+        # work from within the testsuite's directory.
+        # eg. /var/lib/utah/examples
         os.getcwd()
 
         if not os.path.exists(self.path):
@@ -90,7 +92,8 @@
             control_data = _control_data
         elif self.control_file is not None:
             control_data = parse_control_file(self.control_file,
-                                              required=required_items, optional=optional_items)
+                                              required=required_items,
+                                              optional=optional_items)
 
         if control_data is not None:
             self.__dict__.update(control_data)

=== modified file 'utah/commandstr.py'
--- utah/commandstr.py	2012-07-19 13:29:56 +0000
+++ utah/commandstr.py	2012-07-20 10:57:30 +0000
@@ -3,7 +3,6 @@
 """
 
 
-
 def commandstr(command, *args, **kw):
     """
     Convert a command and argument lists into a representation of that command suitable for display to a user.