testsuite: fixed more unit test stuff

13 files changed, 41 insertions, 22 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/Pacman.py b/src/lib/Bcfg2/Client/Tools/Pacman.py
index be6698e18..a4cfd3315 100644
--- a/src/lib/Bcfg2/Client/Tools/Pacman.py
+++ b/src/lib/Bcfg2/Client/Tools/Pacman.py
@@ -31,7 +31,7 @@ class Pacman(Bcfg2.Client.Tools.PkgTool):
         '''Verify Package status for entry'''
 
         self.logger.info("VerifyPackage: %s : %s" % (entry.get('name'),
-                                                      entry.get('version')))
+                                                     entry.get('version')))
 
         if not 'version' in entry.attrib:
             self.logger.info("Cannot verify unversioned package %s" %
diff --git a/src/lib/Bcfg2/Client/Tools/SMF.py b/src/lib/Bcfg2/Client/Tools/SMF.py
index 32a3df2f5..8b23a4a37 100644
--- a/src/lib/Bcfg2/Client/Tools/SMF.py
+++ b/src/lib/Bcfg2/Client/Tools/SMF.py
@@ -76,7 +76,7 @@ class SMF(Bcfg2.Client.Tools.SvcTool):
             if entry.get("FMRI").startswith('lrc'):
                 try:
                     loc = entry.get("FMRI")[4:].replace('_', '.')
-                    self.logger.debug("Renaming file %s to %s" % \
+                    self.logger.debug("Renaming file %s to %s" %
                                       (loc, loc.replace('/S', '/DISABLED.S')))
                     os.rename(loc, loc.replace('/S', '/DISABLED.S'))
                     return True
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index c709d639c..40ff71dbd 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -5,9 +5,9 @@ import os
 import re
 import lxml.etree
 import Bcfg2.Server.Lint
-import Bcfg2.Client.Tools.POSIX
 import Bcfg2.Client.Tools.VCS
 from Bcfg2.Server.Plugins.Packages import Apt, Yum
+from Bcfg2.Client.Tools.POSIX.base import device_map
 try:
     from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
     HAS_GENSHI = True
@@ -59,10 +59,10 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
         Bcfg2.Server.Lint.ServerPlugin.__init__(self, *args, **kwargs)
         self.required_attrs = dict(
             Path=dict(
-                device=dict(name=is_filename, owner=is_username,
+                device=dict(name=is_filename,
+                            owner=is_username,
                             group=is_username,
-                            dev_type=lambda v:
-                                v in Bcfg2.Client.Tools.POSIX.base.device_map),
+                            dev_type=lambda v: v in device_map),
                 directory=dict(name=is_filename, owner=is_username,
                                group=is_username, mode=is_octal_mode),
                 file=dict(name=is_filename, owner=is_username,
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 8cc1439e0..00b55a83b 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -796,14 +796,14 @@ class InfoNode (INode):
         Client="lambda m, e: '%(name)s' == m.hostname and predicate(m, e)",
         Group="lambda m, e: '%(name)s' in m.groups and predicate(m, e)",
         Path="lambda m, e: ('%(name)s' == e.get('name') or " +
-            "'%(name)s' == e.get('realname')) and " +
-            "predicate(m, e)")
+        "'%(name)s' == e.get('realname')) and " +
+        "predicate(m, e)")
     nraw = dict(
         Client="lambda m, e: '%(name)s' != m.hostname and predicate(m, e)",
         Group="lambda m, e: '%(name)s' not in m.groups and predicate(m, e)",
         Path="lambda m, e: '%(name)s' != e.get('name') and " +
-            "'%(name)s' != e.get('realname') and " +
-            "predicate(m, e)")
+        "'%(name)s' != e.get('realname') and " +
+        "predicate(m, e)")
     containers = ['Group', 'Client', 'Path']
 
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Fossil.py b/src/lib/Bcfg2/Server/Plugins/Fossil.py
index d0c328b36..6165ac651 100644
--- a/src/lib/Bcfg2/Server/Plugins/Fossil.py
+++ b/src/lib/Bcfg2/Server/Plugins/Fossil.py
@@ -23,8 +23,8 @@ class Fossil(Bcfg2.Server.Plugin.Version):
                          shell=True,
                          cwd=self.vcs_root,
                          stdout=PIPE).stdout.readlines()
-            revline = [line.split(': ')[1].strip() for line in data if \
-                       line.split(': ')[0].strip() == 'checkout'][-1]
+            revline = [line.split(': ')[1].strip() for line in data
+                       if line.split(': ')[0].strip() == 'checkout'][-1]
             return revline.split(' ')[0]
         except IndexError:
             msg = "Failed to read fossil info"
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 3611f2c6e..b181c2237 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -446,7 +446,7 @@ class MetadataQuery(object):
         return [self.by_name(name) for name in self.all_clients()]
 
 
-class MetadataGroup(tuple):
+class MetadataGroup(tuple):  # pylint: disable=E0012,R0924
     """ representation of a metadata group.  basically just a named tuple """
 
     # pylint: disable=R0913,W0613
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py
index a88c245bd..8a1b07ac8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -2,8 +2,10 @@
 operating system using ohai
 (http://wiki.opscode.com/display/chef/Ohai) """
 
-import lxml.etree
 import os
+import sys
+import glob
+import lxml.etree
 import Bcfg2.Server.Plugin
 
 try:
@@ -31,22 +33,37 @@ class OhaiCache(object):
         self.dirname = dirname
         self.cache = dict()
 
+    def itempath(self, item):
+        return os.path.join(self.dirname, "%s.json" % item)
+
     def __setitem__(self, item, value):
         if value is None:
             # simply return if the client returned nothing
             return
         self.cache[item] = json.loads(value)
-        open("%s/%s.json" % (self.dirname, item), 'w').write(value)
+        open(self.itempath(item), 'w').write(value)
 
     def __getitem__(self, item):
         if item not in self.cache:
             try:
-                data = open("%s/%s.json" % (self.dirname, item)).read()
+                data = open(self.itempath(item)).read()
             except:
                 raise KeyError(item)
             self.cache[item] = json.loads(data)
         return self.cache[item]
 
+    def __delitem__(self, item):
+        if item in self.cache:
+            del self.cache[item]
+        try:
+            os.unlink(self.itempath(item))
+        except:
+            raise IndexError("Could not unlink %s: %s" % (self.itempath(item),
+                                                          sys.exc_info()[1]))
+
+    def __len__(self):
+        return len(glob.glob(self.itempath('*')))
+
     def __iter__(self):
         data = list(self.cache.keys())
         data.extend([x[:-5] for x in os.listdir(self.dirname)])
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index ff57d57e8..332f0bbab 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -7,6 +7,7 @@ import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError
 
 
+# pylint: disable=E0012,R0924
 class PackagesSources(Bcfg2.Server.Plugin.StructFile,
                       Bcfg2.Server.Plugin.Debuggable):
     """ PackagesSources handles parsing of the
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index fa56564fa..a8001d9af 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -58,7 +58,7 @@ class ClientProbeDataSet(dict):
         dict.__init__(self, *args, **kwargs)
 
 
-class ProbeData(str):
+class ProbeData(str):  # pylint: disable=E0012,R0924
     """ a ProbeData object emulates a str object, but also has .xdata,
     .json, and .yaml properties to provide convenient ways to use
     ProbeData objects as XML, JSON, or YAML data """
@@ -231,9 +231,10 @@ class Probes(Bcfg2.Server.Plugin.Probing,
             if pdata.data != data:
                 pdata.data = data
                 pdata.save()
+
         ProbesDataModel.objects.filter(
             hostname=client.hostname).exclude(
-            probe__in=self.probedata[client.hostname]).delete()
+                probe__in=self.probedata[client.hostname]).delete()
 
         for group in self.cgroups[client.hostname]:
             try:
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
index 0c5644395..fc07a90e9 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
@@ -205,7 +205,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                             chain(
                                 *[names[cmeta.hostname]
                                   for cmeta in
-                                      mquery.by_groups([specific.group])]))
+                                  mquery.by_groups([specific.group])]))
                     elif specific.all:
                         # a generic key for all hosts?  really?
                         hostnames = list(chain(*list(names.values())))
diff --git a/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py b/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
index ea7454e11..7dd15f7b5 100644
--- a/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
+++ b/src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
@@ -82,7 +82,7 @@ class TemplateHelper(Bcfg2.Server.Plugin.Plugin,
                      Bcfg2.Server.Plugin.DirectoryBacked):
     """ A plugin to provide helper classes and functions to templates """
     __author__ = 'chris.a.st.pierre@gmail.com'
-    ignore = re.compile("^(\.#.*|.*~|\\..*\\.(sw[px])|.*\.py[co])$")
+    ignore = re.compile(r'^(\.#.*|.*~|\..*\.(sw[px])|.*\.py[co])$')
     patterns = MODULE_RE
     __child__ = HelperModule
 
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
index b77e4b647..58e61e13b 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
@@ -235,7 +235,6 @@ class TestDirectoryBacked(Bcfg2TestCase):
         mock_isdir.return_value = True
         for path in self.testpaths.values():
             reset()
-            print "testing %s" % path
             db.add_directory_monitor(path)
             db.fam.AddMonitor.assert_called_with(os.path.join(db.data, path),
                                                  db)
diff --git a/testsuite/install.sh b/testsuite/install.sh
index c6249002d..817ed5911 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -9,7 +9,8 @@ PYVER=$(python -c 'import sys;print(".".join(str(v) for v in sys.version_info[0:
 if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
     pip install --use-mirrors genshi PyYAML pyinotify
     if [[ $PYVER == "2.5" ]]; then
-        pip install --use-mirrors simplejson
+        # markdown 2.2+ doesn't work on py2.5
+        pip install --use-mirrors simplejson 'markdown<2.2'
     fi
     if [[ ${PYVER:0:1} == "2" ]]; then
         # django supports py3k, but South doesn't, and the django bits