Skip to content

Commit 018195d

Browse files
committed
fix tests
1 parent 7aed691 commit 018195d

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

nipype/caching/tests/test_memory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from nose.tools import assert_equal
88

99
from .. import Memory
10-
from ...pipeline.tests.test_engine import TestInterface
10+
from ...pipeline.engine.tests.test_engine import TestInterface
1111

1212
from ... import config
1313
config.set_default_config()

nipype/pipeline/engine/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
__docformat__ = 'restructuredtext'
1212
from .workflows import Workflow
1313
from .nodes import Node, MapNode, JoinNode
14+
from .utils import generate_expanded_graph

nipype/pipeline/engine/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def fullname(self):
7575
return fullname
7676

7777
def clone(self, name):
78-
"""Clone a workflowbase object
78+
"""Clone an EngineBase object
7979
8080
Parameters
8181
----------

nipype/pipeline/engine/tests/test_engine.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,8 @@ def func1(in1):
540540
try:
541541
n2.run()
542542
except Exception as e:
543-
pe.logger.info('Exception: %s' % str(e))
543+
from nipype.pipeline.engine.base import logger
544+
logger.info('Exception: %s' % str(e))
544545
error_raised = True
545546
yield assert_true, error_raised
546547

nipype/pipeline/engine/workflows.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def add_nodes(self, nodes):
326326
Parameters
327327
----------
328328
nodes : list
329-
A list of WorkflowBase-based objects
329+
A list of EngineBase-based objects
330330
"""
331331
newnodes = []
332332
all_nodes = self._get_all_nodes()
@@ -343,8 +343,8 @@ def add_nodes(self, nodes):
343343
logger.debug('no new nodes to add')
344344
return
345345
for node in newnodes:
346-
if not issubclass(node.__class__, WorkflowBase):
347-
raise Exception('Node %s must be a subclass of WorkflowBase' %
346+
if not issubclass(node.__class__, EngineBase):
347+
raise Exception('Node %s must be a subclass of EngineBase' %
348348
str(node))
349349
self._check_nodes(newnodes)
350350
for node in newnodes:
@@ -358,7 +358,7 @@ def remove_nodes(self, nodes):
358358
Parameters
359359
----------
360360
nodes : list
361-
A list of WorkflowBase-based objects
361+
A list of EngineBase-based objects
362362
"""
363363
self._graph.remove_nodes_from(nodes)
364364

0 commit comments

Comments
 (0)