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

[Javier Collado]

Static analysis changes.

The ones that I'd like you to specially take a look at are:
- Max: rev. 669
- Joe: rev. 668

[lp:~javier.collado/utah/static_analysis_5]

678. By Javier Collado on 2012-08-30

Removed a few NOQA comments that were not used properly

[Max Brustkern (nuclearbob)]

The original intent of that was to allow commands to be run as a string or a list, but if nothing is currently using that option, removing it should be fine.

[Javier Collado (javier.collado)]

I removed it not only because commandstring variable isn't being used, but also because _getcommandargs still is able to concatenate the strings in an array:

        if isinstance(command, basestring):
            args.append(command)
        else:
            args.extend(command)

so that functionality should be still available.

[Max Brustkern (nuclearbob)]

That's super. Looks good to me.

[Javier Collado (javier.collado)]

Joe, any comment from you? As a reminder, I wanted you to take a look a this:

26 + # TBD: Use url and token
227 + # url = self.publish_url
228 + # token = self.publish_token

I commented the variables since they don't seem to be used for anything. I guess the implementation isn't yet finished, but I wanted to check with you just in case this is some other thing that has to be addressed.

[Joe Talbott (joetalbott)]

Those are for pending work so commenting them out is fine.

review: Approve

=== modified file 'docs/source/conf.py'
--- docs/source/conf.py	2012-08-20 11:33:46 +0000
+++ docs/source/conf.py	2012-08-30 09:20:36 +0000
@@ -3,7 +3,8 @@
 # UTAH documentation build configuration file, created by
 # sphinx-quickstart on Tue Aug  7 18:05:11 2012.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing
+# dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -11,7 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -35,13 +37,13 @@
                  'apt', 'apt.cache'):
     sys.modules[mod_name] = Mock(mod_name, (type,), {})
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration ----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -83,7 +85,8 @@
 # directories to ignore when looking for source files.
 exclude_patterns = []
 
-# The reST default role (used for this markup: `text`) to use for all documents.
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
 #default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -104,7 +107,7 @@
 #modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -184,7 +187,7 @@
 htmlhelp_basename = 'UTAHdoc'
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output -------------------------------------------------
 
 latex_elements = {
 # The paper size ('letterpaper' or 'a4paper').
@@ -198,7 +201,8 @@
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# (source start file, target name, title, author,
+#  documentclass [howto/manual]).
 latex_documents = [
   ('index', 'UTAH.tex', u'UTAH Documentation',
    u'Canonical Ltd', 'manual'),
@@ -225,7 +229,7 @@
 #latex_domain_indices = True
 
 
-# -- Options for manual page output --------------------------------------------
+# -- Options for manual page output -------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
@@ -238,7 +242,7 @@
 #man_show_urls = False
 
 
-# -- Options for Texinfo output ------------------------------------------------
+# -- Options for Texinfo output -----------------------------------------------
 
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,

=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-08-28 15:35:55 +0000
+++ examples/run_test_cobbler.py	2012-08-30 09:20:36 +0000
@@ -5,7 +5,6 @@
 
 from utah.exceptions import UTAHException
 from utah.group import check_user_group, print_group_error_message
-from utah.provisioning.baremetal.cobbler import CobblerMachine
 from utah.provisioning.inventory.sqlite import ManualCobblerSQLiteInventory
 from utah.run import run_tests
 from utah.url import url_argument

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-08-14 15:42:17 +0000
+++ examples/run_utah_tests.py	2012-08-30 09:20:36 +0000
@@ -97,7 +97,7 @@
 
 if __name__ == '__main__':
     try:
-        if type( config.jobtimeout) == int:
+        if type(config.jobtimeout) == int:
             try:
                 timeout(config.jobtimeout, run_utah_tests)
             except UTAHTimeout:

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2012-08-21 15:25:08 +0000
+++ utah/client/common.py	2012-08-30 09:20:36 +0000
@@ -57,9 +57,10 @@
     """
     pass
 
+
 # Inspired by:
 # http://stackoverflow.com/a/3326559
-def run_cmd(command, cwd=None, timeout=0, cmd_type=CMD_TC_TEST):  # NOQA
+def run_cmd(command, cwd=None, timeout=0, cmd_type=CMD_TC_TEST):
 
     if command is None:
         return
@@ -115,9 +116,11 @@
                        cmd_type=cmd_type,
                       )
 
+
 # TODO: it might make sense to have a result object that keeps track of
 # test pass, fail, error and serializes it's data.
-def make_result(command, retcode, stdout='', stderr='', start_time='', time_delta='', cmd_type=CMD_TC_TEST):  # NOQA
+def make_result(command, retcode, stdout='', stderr='', start_time='',
+                time_delta='', cmd_type=CMD_TC_TEST):
     """
     Make a result dictionary.
     """
@@ -296,6 +299,7 @@
 
     return retval
 
+
 def get_arch():
     """
     The host's architecture (i.e. i386, amd64, etc.)
@@ -305,16 +309,18 @@
     arch = {
             'x86_64': 'amd64',
             'x86': 'i386',
-            }.get(uname[5]) # 5 == processor
+            }.get(uname[5])  # 5 == processor
 
     return arch
 
+
 def get_release():
     """
     The host's release name (i.e. precise, quantal, etc.)
     """
     return platform.dist()[2]
 
+
 def get_api_config():
     """
     Parse the client configuration file for API configuration data.
@@ -328,6 +334,7 @@
 
     return data['API']
 
+
 def get_build_number():
     host_info = get_host_info()
     pattern = re.compile('.*\(([0-9.]+)\)$')

=== modified file 'utah/client/result.py'
--- utah/client/result.py	2012-08-28 04:08:53 +0000
+++ utah/client/result.py	2012-08-30 09:20:36 +0000
@@ -7,17 +7,20 @@
         get_build_number,
         )
 
+
 def get_smoke_data(result):
     data = {}
     data['build_no'] = get_build_number()
 
     return data
 
+
 def get_kernel_sru_data(result):
     data = {}
 
     return data
 
+
 # XXX: this logic should probably be moved into the __init__ method
 # of the result object since there will be one result object per
 # master.run
@@ -35,6 +38,7 @@
     if publish_type and publish_type in type_map.iterkeys():
         return type_map[publish_type](result)
 
+
 class Result(object):
     """
     Result collection class.
@@ -147,8 +151,9 @@
         return len(self.results)
 
     def publish_results(self):
-        url = self.publish_url
-        token = self.publish_token
+        # TBD: Use url and token
+        # url = self.publish_url
+        # token = self.publish_token
 
         create_payload(self)
 
@@ -213,6 +218,7 @@
 
         return status
 
+
 class ResultJSON(Result):
     def result(self, verbose=False):
 

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2012-08-28 11:22:41 +0000
+++ utah/client/runner.py	2012-08-30 09:20:36 +0000
@@ -81,7 +81,7 @@
                 'enum': ['smoke', 'kernel-sru', 'bootspeed', 'upgrade'],
                 },
             "publish": {
-                'type' : 'object',
+                'type': 'object',
                 'properties': {
                     "url": {
                         "type": "string",
@@ -396,7 +396,8 @@
                 os.mkdir(name)
 
             if name not in self.fetched_suites:
-                self.result.add_result(run_cmd(fetch_cmd, cwd=name, cmd_type=CMD_TS_FETCH))
+                self.result.add_result(run_cmd(fetch_cmd, cwd=name,
+                                               cmd_type=CMD_TS_FETCH))
                 self.fetched_suites.append(name)
 
             # If fetch_cmd failed move on to the next testsuite.

=== modified file 'utah/client/tests/test_state_agent.py'
--- utah/client/tests/test_state_agent.py	2012-08-08 16:17:12 +0000
+++ utah/client/tests/test_state_agent.py	2012-08-30 09:20:36 +0000
@@ -145,7 +145,8 @@
         # Need to set up utah_tests since we're simulating a restart
         test_src = os.path.join(get_module_path(), 'client',
                 'examples', 'utah_tests')
-        test_dir = os.path.join(UTAH_DIR, 'testsuites', 'utah_tests', 'utah_tests')
+        test_dir = os.path.join(UTAH_DIR, 'testsuites',
+                                'utah_tests', 'utah_tests')
         if not os.path.exists(test_dir):
             shutil.copytree(test_src, test_dir)
 

=== modified file 'utah/iso.py'
--- utah/iso.py	2012-08-29 12:39:17 +0000
+++ utah/iso.py	2012-08-30 09:20:36 +0000
@@ -123,7 +123,8 @@
             self.logger = logger
         if image.startswith('~'):
             path = os.path.expanduser(image)
-            self.logger.debug('Rewriting ~-based path: ' + image + ' to: ' + path)
+            self.logger.debug('Rewriting ~-based path: ' + image +
+                              ' to: ' + path)
         else:
             path = image
 
@@ -228,10 +229,12 @@
         return listfiles(self.image, self.logger.debug, returnlist=returnlist)
 
     def getrealfile(self, filename, outdir=None):
-        return getrealfile(self.image, filename, outdir=outdir, logmethod=self.logger.debug)
+        return getrealfile(self.image, filename, outdir=outdir,
+                           logmethod=self.logger.debug)
 
     def extract(self, filename, outdir=None, outfile=None, **kw):
-        return extract(self.image, filename, outdir, outfile, logmethod=self.logger.debug, **kw)
+        return extract(self.image, filename, outdir, outfile,
+                       logmethod=self.logger.debug, **kw)
 
     def dump(self, filename, **kw):
         return dump(self.image, filename, logmethod=self.logger.debug, **kw)
@@ -239,4 +242,3 @@
     def extractall(self):
         for myfile in self.listfiles(returnlist=True):
             self.extract(myfile)
-

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-08-24 18:26:16 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-08-30 09:20:36 +0000
@@ -7,7 +7,6 @@
 import tempfile
 import time
 
-import utah
 from utah import config
 from utah.provisioning.provisioning import (
         CustomInstallMixin,

=== modified file 'utah/provisioning/vm/libvirtvm.py'
--- utah/provisioning/vm/libvirtvm.py	2012-08-24 18:26:16 +0000
+++ utah/provisioning/vm/libvirtvm.py	2012-08-30 09:20:36 +0000
@@ -312,10 +312,6 @@
         """
         if quiet is None:
             quiet = not self.debug
-        if isinstance(command, basestring):
-            commandstring = command
-        else:
-            commandstring = ' '.join(command)
         self.activecheck()
         args = self._getcommandargs(command=command, quiet=quiet,
                              root=root, timeout=timeout)

=== modified file 'utah/timeout.py'
--- utah/timeout.py	2012-08-22 15:20:25 +0000
+++ utah/timeout.py	2012-08-30 09:20:36 +0000
@@ -18,7 +18,7 @@
 # Mostly pulled from utah/client/common.py
 # Inspired by:
 # http://stackoverflow.com/a/3326559
-def timeout(timeout, command, *args, **kw):  # NOQA
+def timeout(timeout, command, *args, **kw):
     """
     Run command with all other arguments for up to timeout seconds, after with
     a UTAHTimeout exception is returned.