summaryrefslogtreecommitdiff
path: root/taskflow/tests/unit/test_flow_dependencies.py
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2014-07-18 12:58:18 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2014-09-08 20:55:45 +0000
commitd6ef68762e847373be0584820fa0557fcbd5003f (patch)
tree4473103af0af35fb38017603b28e00316b484ce3 /taskflow/tests/unit/test_flow_dependencies.py
parent76641d86b89cdba23ac49d8c65011467a098f6dc (diff)
downloadtaskflow-d6ef68762e847373be0584820fa0557fcbd5003f.tar.gz
Relax the graph flow symbol constraints
In order to make it possible to have a symbol tree we need to relax the constraints that are being imposed by the graph flow. Part of blueprint taskflow-improved-scoping Change-Id: I2e14de2131c3ba4e3e4eb3108477583d0f02dae2
Diffstat (limited to 'taskflow/tests/unit/test_flow_dependencies.py')
-rw-r--r--taskflow/tests/unit/test_flow_dependencies.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/taskflow/tests/unit/test_flow_dependencies.py b/taskflow/tests/unit/test_flow_dependencies.py
index 47604e8..69f4a8f 100644
--- a/taskflow/tests/unit/test_flow_dependencies.py
+++ b/taskflow/tests/unit/test_flow_dependencies.py
@@ -218,9 +218,8 @@ class FlowDependenciesTest(test.TestCase):
def test_graph_flow_provides_provided_value_other_call(self):
flow = gf.Flow('gf')
flow.add(utils.TaskOneReturn('task1', provides='x'))
- self.assertRaises(exceptions.DependencyFailure,
- flow.add,
- utils.TaskOneReturn('task2', provides='x'))
+ flow.add(utils.TaskOneReturn('task2', provides='x'))
+ self.assertEqual(set(['x']), flow.provides)
def test_graph_flow_multi_provides_and_requires_values(self):
flow = gf.Flow('gf').add(
@@ -367,17 +366,16 @@ class FlowDependenciesTest(test.TestCase):
self.assertEqual(flow.requires, set(['x', 'y', 'c']))
self.assertEqual(flow.provides, set(['a', 'b', 'z']))
- def test_graph_flow_retry_and_task_dependency_conflict(self):
+ def test_graph_flow_retry_and_task_dependency_provide_require(self):
flow = gf.Flow('gf', retry.AlwaysRevert('rt', requires=['x']))
- self.assertRaises(exceptions.DependencyFailure,
- flow.add,
- utils.TaskOneReturn(provides=['x']))
+ flow.add(utils.TaskOneReturn(provides=['x']))
+ self.assertEqual(set(['x']), flow.provides)
+ self.assertEqual(set(['x']), flow.requires)
def test_graph_flow_retry_and_task_provide_same_value(self):
flow = gf.Flow('gf', retry.AlwaysRevert('rt', provides=['x']))
- self.assertRaises(exceptions.DependencyFailure,
- flow.add,
- utils.TaskOneReturn('t1', provides=['x']))
+ flow.add(utils.TaskOneReturn('t1', provides=['x']))
+ self.assertEqual(set(['x']), flow.provides)
def test_builtin_retry_args(self):