Skip to content

FIX sometimes-failing test (memory) iss 1607 #1650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2016
Merged

FIX sometimes-failing test (memory) iss 1607 #1650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions nipype/pipeline/plugins/tests/test_multiproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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})


Expand Down Expand Up @@ -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)
Expand Down