diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2011-05-10 11:24:28 -0500 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2011-05-10 11:24:28 -0500 |
commit | 0e75875e9bd9900a6a3c7ab118c448e48829eaef (patch) | |
tree | 391204747f48598c4e978d3724afbd5b8aa1d12c /testsuite/TestFrame.py | |
parent | f2d218ccd2de93ef639347933ba127ef081b4401 (diff) | |
parent | 91634f9a3b888eee3cd5f9a777fcb075fc666c9a (diff) | |
download | bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.tar.gz bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.tar.bz2 bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.zip |
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'testsuite/TestFrame.py')
-rw-r--r-- | testsuite/TestFrame.py | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/testsuite/TestFrame.py b/testsuite/TestFrame.py index 679e3ce27..a76c97eec 100644 --- a/testsuite/TestFrame.py +++ b/testsuite/TestFrame.py @@ -1,17 +1,21 @@ import lxml.etree -import Bcfg2.Client.Frame, Bcfg2.Client.Tools +import Bcfg2.Client.Frame +import Bcfg2.Client.Tools c1 = lxml.etree.XML("<Configuration><Bundle name='foo'><Configfile name='/tmp/test12' owner='root' group='root' empty='true' perms='644'/></Bundle></Configuration>") c2 = lxml.etree.XML("<Configuration><Bundle name='foo'><Configfile name='/tmp/test12' owner='root' group='root' empty='true' perms='644'/><Configfile name='/tmp/test12' owner='root' group='root' empty='true' perms='644'/></Bundle></Configuration>") + class DriverInitFail(object): def __init__(self, *args): raise Bcfg2.Client.Tools.toolInstantiationError + class DriverInventoryFail(object): __name__ = 'dif' + def __init__(self, logger, setup, config): self.config = config self.handled = [] @@ -49,40 +53,48 @@ class TestFrame(object): assert len(frame.tools) == 0 def test__Decide_Inventory(self): - setup = {'remove':'none', 'bundle':[], 'interactive':False} + setup = {'remove': 'none', + 'bundle': [], + 'interactive': False} times = {} frame = Bcfg2.Client.Frame.Frame(c2, setup, times, [DriverInventoryFail], False) assert len(frame.tools) == 1 frame.Inventory() - assert len([x for x in frame.states.values() if x]) == 0 + assert len([x for x in list(frame.states.values()) if x]) == 0 frame.Decide() assert len(frame.whitelist) def test__Decide_Bundle(self): - setup = {'remove':'none', 'bundle':['bar'], 'interactive':False} + setup = {'remove': 'none', + 'bundle': ['bar'], + 'interactive': False} times = {} frame = Bcfg2.Client.Frame.Frame(c2, setup, times, [DriverInventoryFail], False) assert len(frame.tools) == 1 frame.Inventory() - assert len([x for x in frame.states.values() if x]) == 0 + assert len([x for x in list(frame.states.values()) if x]) == 0 frame.Decide() assert len(frame.whitelist) == 0 def test__Decide_Dryrun(self): - setup = {'remove':'none', 'bundle':[], 'interactive':False} + setup = {'remove': 'none', + 'bundle': [], + 'interactive': False} times = {} frame = Bcfg2.Client.Frame.Frame(c2, setup, times, [DriverInventoryFail], True) assert len(frame.tools) == 1 frame.Inventory() - assert len([x for x in frame.states.values() if x]) == 0 + assert len([x for x in list(frame.states.values()) if x]) == 0 frame.Decide() assert len(frame.whitelist) == 0 def test__GenerateStats(self): - setup = {'remove':'none', 'bundle':[], 'interactive':False} + setup = {'remove': 'none', + 'bundle': [], + 'interactive': False} times = {} frame = Bcfg2.Client.Frame.Frame(c2, setup, times, [DriverInventoryFail], False) @@ -90,4 +102,3 @@ class TestFrame(object): frame.Decide() stats = frame.GenerateStats() assert len(stats.findall('.//Bad')[0].getchildren()) != 0 - |