On Fri, Jan 7, 2011 at 16:03 +0000, Michael Hanselmann <[email protected]>
wrote:
> Am 7. Januar 2011 16:02 schrieb Michael Hanselmann <[email protected]>:
> > Am 7. Januar 2011 15:49 schrieb Adeodato Simo <[email protected]>:
> >> --- a/test/ganeti.cmdlib_unittest.py
> >> +++ b/test/ganeti.cmdlib_unittest.py
> >> +class TestLUAssignNodes(unittest.TestCase):
> >> +
> >> + def testCheckAssignmentForSplitInstances(self):
> >> + node_data = dict((node.name, node)
> >> + for node in [objects.Node(name='n1a', group='g1'),
> > s/""/''/ (in the whole patch)
> Ups, the other way around, sorry.
Oops, my default (which is '') just kicked in...
--- a/test/ganeti.cmdlib_unittest.py
+++ b/test/ganeti.cmdlib_unittest.py
@@ -161,13 +161,13 @@ class TestLUAssignNodes(unittest.TestCase):
def testCheckAssignmentForSplitInstances(self):
node_data = dict((node.name, node)
- for node in [objects.Node(name='n1a', group='g1'),
- objects.Node(name='n1b', group='g1'),
- objects.Node(name='n2a', group='g2'),
- objects.Node(name='n2b', group='g2'),
- objects.Node(name='n3a', group='g3'),
- objects.Node(name='n3b', group='g3'),
- objects.Node(name='n3c', group='g3'),
+ for node in [objects.Node(name="n1a", group="g1"),
+ objects.Node(name="n1b", group="g1"),
+ objects.Node(name="n2a", group="g2"),
+ objects.Node(name="n2b", group="g2"),
+ objects.Node(name="n3a", group="g3"),
+ objects.Node(name="n3b", group="g3"),
+ objects.Node(name="n3c", group="g3"),
])
def Instance(name, pnode, snode):
@@ -183,12 +183,12 @@ class TestLUAssignNodes(unittest.TestCase):
disk_template=disk_template)
instance_data = dict((inst.name, inst)
- for inst in [Instance('inst1a', 'n1a', 'n1b'),
- Instance('inst1b', 'n1b', 'n1a'),
- Instance('inst2a', 'n2a', 'n2b'),
- Instance('inst3a', 'n3a', None),
- Instance('inst3b', 'n3b', 'n1b'),
- Instance('inst3c', 'n3b', 'n2b'),
+ for inst in [Instance("inst1a", "n1a", "n1b"),
+ Instance("inst1b", "n1b", "n1a"),
+ Instance("inst2a", "n2a", "n2b"),
+ Instance("inst3a", "n3a", None),
+ Instance("inst3b", "n3b", "n1b"),
+ Instance("inst3c", "n3b", "n2b"),
])
# Test first with the existing state.
@@ -196,14 +196,14 @@ class TestLUAssignNodes(unittest.TestCase):
[], node_data, instance_data)
self.assertEqual([], new)
- self.assertEqual(set(['inst3b', 'inst3c']), set(prev))
+ self.assertEqual(set(["inst3b", "inst3c"]), set(prev))
# And now some changes.
new, prev = cmdlib.LUAssignNodes.CheckAssignmentForSplitInstances(
- [('n1b', 'g3')], node_data, instance_data)
+ [("n1b", "g3")], node_data, instance_data)
- self.assertEqual(set(['inst1a', 'inst1b']), set(new))
- self.assertEqual(set(['inst3c']), set(prev))
+ self.assertEqual(set(["inst1a", "inst1b"]), set(new))
+ self.assertEqual(set(["inst3c"]), set(prev))
if __name__ == "__main__":
--
Adeodato Simo | [email protected]
Corp Computing Services SRE (Dublin)
