From 06ffceea77ea65f335cfb5652fb057017e5807ba Mon Sep 17 00:00:00 2001 From: Manish Godara Date: Fri, 13 Feb 2015 15:53:22 -0800 Subject: [PATCH] Update Flow::__str__ The current implementation seems a little cryptic so updating it to clearly indicate the atom count. Change-Id: I4f97e458a4b80e33b3d6348a3ef632398586ed47 --- taskflow/flow.py | 5 ++--- taskflow/tests/unit/patterns/test_graph_flow.py | 2 +- taskflow/tests/unit/patterns/test_linear_flow.py | 4 ++-- taskflow/tests/unit/patterns/test_unordered_flow.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/taskflow/flow.py b/taskflow/flow.py index cd70e7c9..5eb05825 100644 --- a/taskflow/flow.py +++ b/taskflow/flow.py @@ -96,9 +96,8 @@ class Flow(object): """ def __str__(self): - lines = ["%s: %s" % (reflection.get_class_name(self), self.name)] - lines.append("%s" % (len(self))) - return "; ".join(lines) + return "%s: %s(len=%d)" % (reflection.get_class_name(self), + self.name, len(self)) @property def provides(self): diff --git a/taskflow/tests/unit/patterns/test_graph_flow.py b/taskflow/tests/unit/patterns/test_graph_flow.py index 62dbc287..8dad447d 100644 --- a/taskflow/tests/unit/patterns/test_graph_flow.py +++ b/taskflow/tests/unit/patterns/test_graph_flow.py @@ -37,7 +37,7 @@ class GraphFlowTest(test.TestCase): self.assertEqual(f.requires, set()) self.assertEqual(f.provides, set()) - expected = 'taskflow.patterns.graph_flow.Flow: test; 0' + expected = 'taskflow.patterns.graph_flow.Flow: test(len=0)' self.assertEqual(str(f), expected) def test_graph_flow_add_nothing(self): diff --git a/taskflow/tests/unit/patterns/test_linear_flow.py b/taskflow/tests/unit/patterns/test_linear_flow.py index 23f891a8..48f8f8de 100644 --- a/taskflow/tests/unit/patterns/test_linear_flow.py +++ b/taskflow/tests/unit/patterns/test_linear_flow.py @@ -36,7 +36,7 @@ class LinearFlowTest(test.TestCase): self.assertEqual(f.requires, set()) self.assertEqual(f.provides, set()) - expected = 'taskflow.patterns.linear_flow.Flow: test; 0' + expected = 'taskflow.patterns.linear_flow.Flow: test(len=0)' self.assertEqual(str(f), expected) def test_linear_flow_add_nothing(self): @@ -107,7 +107,7 @@ class LinearFlowTest(test.TestCase): (task2, task3, {'invariant': True}) ]) - expected = 'taskflow.patterns.linear_flow.Flow: test; 3' + expected = 'taskflow.patterns.linear_flow.Flow: test(len=3)' self.assertEqual(str(f), expected) def test_linear_flow_with_retry(self): diff --git a/taskflow/tests/unit/patterns/test_unordered_flow.py b/taskflow/tests/unit/patterns/test_unordered_flow.py index e55cfad0..195516b6 100644 --- a/taskflow/tests/unit/patterns/test_unordered_flow.py +++ b/taskflow/tests/unit/patterns/test_unordered_flow.py @@ -36,7 +36,7 @@ class UnorderedFlowTest(test.TestCase): self.assertEqual(f.requires, set()) self.assertEqual(f.provides, set()) - expected = 'taskflow.patterns.unordered_flow.Flow: test; 0' + expected = 'taskflow.patterns.unordered_flow.Flow: test(len=0)' self.assertEqual(str(f), expected) def test_unordered_flow_add_nothing(self):