Merge pull request #1516 from shoshber/uniquecrashfile

FIX/WIP unique crash files

Author: satra

nipype/pipeline/plugins/base.py

@@ -13,6 +13,7 @@
 import shutil
 from socket import gethostname
 import sys
+import uuid
 from time import strftime, sleep, time
 from traceback import format_exception, format_exc
 from warnings import warn
@@ -57,9 +58,10 @@ def report_crash(node, traceback=None, hostname=None):
                                      exc_traceback)
     timeofcrash = strftime('%Y%m%d-%H%M%S')
     login_name = getpass.getuser()
-    crashfile = 'crash-%s-%s-%s.pklz' % (timeofcrash,
-                                         login_name,
-                                         name)
+    crashfile = 'crash-%s-%s-%s-%s.pklz' % (timeofcrash,
+                                            login_name,
+                                            name,
+                                            str(uuid.uuid4()))
     crashdir = node.config['execution']['crashdump_dir']
     if crashdir is None:
         crashdir = os.getcwd()

nipype/pipeline/plugins/tests/test_base.py

@@ -4,18 +4,39 @@
 """
 import numpy as np
 import scipy.sparse as ssp
+import re
+
+import mock
 
 from nipype.testing import (assert_raises, assert_equal, assert_true,
-                            assert_false, skipif)
+                            assert_false, skipif, assert_regexp_matches)
 import nipype.pipeline.plugins.base as pb
 
-
 def test_scipy_sparse():
     foo = ssp.lil_matrix(np.eye(3, k=1))
     goo = foo.getrowview(0)
     goo[goo.nonzero()] = 0
     yield assert_equal, foo[0, 1], 0
 
+def test_report_crash():
+    with mock.patch('pickle.dump', mock.MagicMock()) as mock_pickle_dump:
+        with mock.patch('nipype.pipeline.plugins.base.format_exception', mock.MagicMock()): # see iss 1517
+            mock_pickle_dump.return_value = True
+            mock_node = mock.MagicMock(name='mock_node')
+            mock_node._id = 'an_id'
+            mock_node.config = {
+                'execution' : {
+                    'crashdump_dir' : '.'
+                }
+            }
+
+            actual_crashfile = pb.report_crash(mock_node)
+
+            expected_crashfile = re.compile('.*/crash-.*-an_id-[0-9a-f\-]*.pklz')
+
+            yield assert_regexp_matches, actual_crashfile, expected_crashfile
+            yield assert_true, mock_pickle_dump.call_count == 1
+
 '''
 Can use the following code to test that a mapnode crash continues successfully
 Need to put this into a nose-test with a timeout