openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Ensure node 'remove' and 'disassociate' can not be called when frozen"

Browse Source
This commit is contained in:
Jenkins
2015-11-18 16:37:17 +00:00
committed by Gerrit Code Review
parent d5e43e3dc3 4f41c43ed0
commit b09eda808f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
taskflow/tests/unit/test_types.py
View File

@@ -390,6 +390,18 @@ CEO
root = tree.Node("josh") root = tree.Node("josh")
self.assertTrue(root.empty()) self.assertTrue(root.empty())
def test_after_frozen(self):
root = tree.Node("josh")
root.add(tree.Node("josh.1"))
root.freeze()
self.assertTrue(
all(n.frozen for n in root.dfs_iter(include_self=True)))
self.assertRaises(tree.FrozenNode,
root.remove, "josh.1")
self.assertRaises(tree.FrozenNode, root.disassociate)
self.assertRaises(tree.FrozenNode, root.add,
tree.Node("josh.2"))
def test_removal(self): def test_removal(self):
root = self._make_species() root = self._make_species()
self.assertIsNotNone(root.remove('reptile')) self.assertIsNotNone(root.remove('reptile'))

2
taskflow/types/tree.py
View File

@@ -200,6 +200,7 @@ class Node(object):
only_direct=only_direct, only_direct=only_direct,
include_self=include_self) include_self=include_self)
@misc.disallow_when_frozen(FrozenNode)
def disassociate(self): def disassociate(self):
"""Removes this node from its parent (if any). """Removes this node from its parent (if any).
@@ -219,6 +220,7 @@ class Node(object):
occurrences += 1 occurrences += 1
return occurrences return occurrences
@misc.disallow_when_frozen(FrozenNode)
def remove(self, item, only_direct=False, include_self=True): def remove(self, item, only_direct=False, include_self=True):
"""Removes a item from this nodes children. """Removes a item from this nodes children.