fix tests

Author: oesteban

nipype/caching/tests/test_memory.py

@@ -7,7 +7,7 @@
 from nose.tools import assert_equal
 
 from .. import Memory
-from ...pipeline.tests.test_engine import TestInterface
+from ...pipeline.engine.tests.test_engine import TestInterface
 
 from ... import config
 config.set_default_config()

nipype/pipeline/engine/__init__.py

@@ -11,3 +11,4 @@
 __docformat__ = 'restructuredtext'
 from .workflows import Workflow
 from .nodes import Node, MapNode, JoinNode
+from .utils import generate_expanded_graph

nipype/pipeline/engine/base.py

@@ -75,7 +75,7 @@ def fullname(self):
         return fullname
 
     def clone(self, name):
-        """Clone a workflowbase object
+        """Clone an EngineBase object
 
         Parameters
         ----------

nipype/pipeline/engine/tests/test_engine.py

@@ -540,7 +540,8 @@ def func1(in1):
     try:
         n2.run()
     except Exception as e:
-        pe.logger.info('Exception: %s' % str(e))
+        from nipype.pipeline.engine.base import logger
+        logger.info('Exception: %s' % str(e))
         error_raised = True
     yield assert_true, error_raised
 

nipype/pipeline/engine/workflows.py

@@ -326,7 +326,7 @@ def add_nodes(self, nodes):
         Parameters
         ----------
         nodes : list
-            A list of WorkflowBase-based objects
+            A list of EngineBase-based objects
         """
         newnodes = []
         all_nodes = self._get_all_nodes()
@@ -343,8 +343,8 @@ def add_nodes(self, nodes):
             logger.debug('no new nodes to add')
             return
         for node in newnodes:
-            if not issubclass(node.__class__, WorkflowBase):
-                raise Exception('Node %s must be a subclass of WorkflowBase' %
+            if not issubclass(node.__class__, EngineBase):
+                raise Exception('Node %s must be a subclass of EngineBase' %
                                 str(node))
         self._check_nodes(newnodes)
         for node in newnodes:
@@ -358,7 +358,7 @@ def remove_nodes(self, nodes):
         Parameters
         ----------
         nodes : list
-            A list of WorkflowBase-based objects
+            A list of EngineBase-based objects
         """
         self._graph.remove_nodes_from(nodes)