diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-24 15:44:06 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-25 10:45:14 -0400 |
commit | 044213c789c4f1ee214da3d70f02352b1aaa8673 (patch) | |
tree | feb62ab035d27773f20be1e052a177c0c61299aa /src/lib/Bcfg2/Server/Admin | |
parent | 0ff6b2788de683dd89203c7ae1393ea922a62c32 (diff) | |
download | bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.gz bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.tar.bz2 bcfg2-044213c789c4f1ee214da3d70f02352b1aaa8673.zip |
Fixing unit tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Viz.py | 21 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/__init__.py | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py index cdd8fd0cb..a29fdaceb 100644 --- a/src/lib/Bcfg2/Server/Admin/Viz.py +++ b/src/lib/Bcfg2/Server/Admin/Viz.py @@ -4,6 +4,7 @@ import getopt import Bcfg2.Server.Admin from Bcfg2.Utils import Executor + class Viz(Bcfg2.Server.Admin.MetadataCore): """ Produce graphviz diagrams of metadata structures """ __usage__ = ("[options]\n\n" @@ -79,16 +80,16 @@ class Viz(Bcfg2.Server.Admin.MetadataCore): self.metadata.viz(hosts, bundles, key, only_client, self.colors)] if key: - idata.extend([ - "\tsubgraph cluster_key {", - '\tstyle="filled";', - '\tcolor="lightblue";', - '\tBundle [ shape="septagon" ];', - '\tGroup [shape="ellipse"];', - '\tProfile [style="bold", shape="ellipse"];', - '\tHblock [label="Host1|Host2|Host3",shape="record"];', - '\tlabel="Key";', - "\t}"]) + idata.extend( + ["\tsubgraph cluster_key {", + '\tstyle="filled";', + '\tcolor="lightblue";', + '\tBundle [ shape="septagon" ];', + '\tGroup [shape="ellipse"];', + '\tProfile [style="bold", shape="ellipse"];', + '\tHblock [label="Host1|Host2|Host3",shape="record"];', + '\tlabel="Key";', + "\t}"]) idata.append("}") try: result = exc.run(cmd, inputdata=idata) diff --git a/src/lib/Bcfg2/Server/Admin/__init__.py b/src/lib/Bcfg2/Server/Admin/__init__.py index 3fbdf8fa8..d317cc03b 100644 --- a/src/lib/Bcfg2/Server/Admin/__init__.py +++ b/src/lib/Bcfg2/Server/Admin/__init__.py @@ -116,10 +116,10 @@ class MetadataCore(Mode): Mode.__init__(self) if self.__plugin_whitelist__ is not None: self.setup['plugins'] = [p for p in self.setup['plugins'] - if p in self.__plugin_whitelist__] + if p in self.__plugin_whitelist__] elif self.__plugin_blacklist__ is not None: self.setup['plugins'] = [p for p in self.setup['plugins'] - if p not in self.__plugin_blacklist__] + if p not in self.__plugin_blacklist__] # admin modes don't need to watch for changes. one shot is fine here. self.setup['filemonitor'] = 'pseudo' |