From 9dc02381c1f2c23a656d45390d12890318d574f4 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 28 Oct 2013 10:20:05 -0400
Subject: fixed misc. unit tests

---
 src/lib/Bcfg2/Server/Lint/AWSTags.py    | 3 +++
 src/lib/Bcfg2/Server/Plugins/AWSTags.py | 4 ++--
 src/lib/Bcfg2/Server/Plugins/SSHbase.py | 6 ++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/lib/Bcfg2/Server')

diff --git a/src/lib/Bcfg2/Server/Lint/AWSTags.py b/src/lib/Bcfg2/Server/Lint/AWSTags.py
index a6af63dd6..25ad4ef61 100644
--- a/src/lib/Bcfg2/Server/Lint/AWSTags.py
+++ b/src/lib/Bcfg2/Server/Lint/AWSTags.py
@@ -1,3 +1,6 @@
+""" ``bcfg2-lint`` plugin to check all given :ref:`AWSTags
+<server-plugins-connectors-awstags>` patterns for validity."""
+
 import re
 import sys
 import Bcfg2.Server.Lint
diff --git a/src/lib/Bcfg2/Server/Plugins/AWSTags.py b/src/lib/Bcfg2/Server/Plugins/AWSTags.py
index 4b81a1275..166eb1066 100644
--- a/src/lib/Bcfg2/Server/Plugins/AWSTags.py
+++ b/src/lib/Bcfg2/Server/Plugins/AWSTags.py
@@ -106,7 +106,6 @@ class PatternFile(Bcfg2.Server.Plugin.XMLFileBacked):
 
 
 class AWSTags(Bcfg2.Server.Plugin.Plugin,
-              Bcfg2.Server.Plugin.Caching,
               Bcfg2.Server.Plugin.ClientRunHooks,
               Bcfg2.Server.Plugin.Connector):
     """ Query tags from AWS via boto, optionally setting group membership """
@@ -114,7 +113,6 @@ class AWSTags(Bcfg2.Server.Plugin.Plugin,
 
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        Bcfg2.Server.Plugin.Caching.__init__(self)
         Bcfg2.Server.Plugin.ClientRunHooks.__init__(self)
         Bcfg2.Server.Plugin.Connector.__init__(self)
         try:
@@ -177,6 +175,8 @@ class AWSTags(Bcfg2.Server.Plugin.Plugin,
         return self._tagcache[metadata.hostname]
 
     def expire_cache(self, key=None):
+        """ Expire the cache for one host, or for all hosts.  This is
+        exposed as an XML-RPC RMI. """
         self._tagcache.expire(key=key)
 
     def start_client_run(self, metadata):
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
index 1bb4ec9f0..a3fbc04f3 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
@@ -6,6 +6,7 @@ import sys
 import socket
 import shutil
 import tempfile
+import lxml.etree
 import Bcfg2.Options
 import Bcfg2.Server.Plugin
 from itertools import chain
@@ -409,12 +410,9 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
                     self.entries[entry.get('name')].bind_entry(entry, metadata)
                     is_bound = True
                 except Bcfg2.Server.Plugin.PluginExecutionError:
-                    import lxml.etree
-
-                    print("failed to bind %s: %s") % (
+                    print("Failed to bind %s: %s") % (
                         lxml.etree.tostring(entry),
                         sys.exc_info()[1])
-                    pass
 
     def GenerateHostKeyPair(self, client, filename):
         """Generate new host key pair for client."""
-- 
cgit v1.2.3-1-g7c22