From 6f27f7f30ee0bcfcb3f6a4c48c153ea39a2accce Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Thu, 7 Apr 2011 14:04:17 -0500
Subject: testsuite: PY3K + PEP8 fixes

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 testsuite/TestFrame.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'testsuite/TestFrame.py')

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
-
-- 
cgit v1.2.3-1-g7c22