From ece764b95cfeefb9e2284192f07f3c7092de8026 Mon Sep 17 00:00:00 2001 From: Romain Dorgueil Date: Mon, 23 Oct 2017 21:28:49 +0200 Subject: [PATCH] [tests] rename factory test and move bag detecting so any bag is returned as is as an output. --- bonobo/execution/node.py | 4 ++-- tests/nodes/{factory.py => test_factory.py} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename tests/nodes/{factory.py => test_factory.py} (96%) diff --git a/bonobo/execution/node.py b/bonobo/execution/node.py index 445c2f6..6c52e7d 100644 --- a/bonobo/execution/node.py +++ b/bonobo/execution/node.py @@ -9,7 +9,7 @@ from bonobo.execution.base import LoopingExecutionContext from bonobo.structs.bags import Bag from bonobo.structs.inputs import Input from bonobo.structs.tokens import Token -from bonobo.util import get_name, iserrorbag, isloopbackbag +from bonobo.util import get_name, iserrorbag, isloopbackbag, isbag from bonobo.util.compat import deprecated_alias from bonobo.util.statistics import WithStatistics @@ -142,7 +142,7 @@ def _resolve(input_bag, output): if output is NOT_MODIFIED: return input_bag - if iserrorbag(output): + if isbag(output): return output return Bag(output) diff --git a/tests/nodes/factory.py b/tests/nodes/test_factory.py similarity index 96% rename from tests/nodes/factory.py rename to tests/nodes/test_factory.py index 8443cb6..781ba57 100644 --- a/tests/nodes/factory.py +++ b/tests/nodes/test_factory.py @@ -11,7 +11,7 @@ from bonobo.util.testing import BufferingNodeExecutionContext class FactoryTypeTest(TestCase): def execute_node(self, node, *rows): with BufferingNodeExecutionContext(node) as context: - context.write_sync(*map(Bag, rows)) + context.write_sync(*rows) return context.get_buffer() def test_args_as_str(self):