Merge pull request #1650 from shoshber/multiprocfix

FIX sometimes-failing test (memory) iss 1607

Author: chrisgorgo

nipype/pipeline/plugins/tests/test_multiproc.py

@@ -77,7 +77,7 @@ def _run_interface(self, runtime):
 
     def _list_outputs(self):
         outputs = self._outputs().get()
-        outputs['output1'] =  self.inputs.input1
+        outputs['output1'] = self.inputs.input1
         return outputs
 
 
@@ -123,7 +123,7 @@ def find_metrics(nodes, last_node):
     return total_memory, total_threads
 
 
-def test_do_not_use_more_memory_then_specified():
+def test_no_more_memory_than_specified():
     LOG_FILENAME = 'callback.log'
     my_logger = logging.getLogger('callback')
     my_logger.setLevel(logging.DEBUG)
@@ -151,7 +151,7 @@ def test_do_not_use_more_memory_then_specified():
     n1.inputs.input1 = 1
 
     pipe.run(plugin='MultiProc',
-             plugin_args={'memory': max_memory,
+             plugin_args={'memory_gb': max_memory,
                           'status_callback': log_nodes_cb})
 
 
@@ -182,7 +182,7 @@ def test_do_not_use_more_memory_then_specified():
     os.remove(LOG_FILENAME)
 
 @skipif(nib.runtime_profile == False)
-def test_do_not_use_more_threads_then_specified():
+def test_no_more_threads_than_specified():
     LOG_FILENAME = 'callback.log'
     my_logger = logging.getLogger('callback')
     my_logger.setLevel(logging.DEBUG)