Simplify dicom check, add more comments for test_monitor

Author: mvdoc

heudiconv/convert.py

@@ -236,7 +236,7 @@ def convert(items, converter, scaninfo_suffix, custom_callable, with_prov,
 
         prefix, outtypes, item_dicoms = item[:3]
         if not isinstance(outtypes, (list, tuple)):
-            outtypes = [outtypes]
+            outtypes = (outtypes,)
 
         prefix_dirname = op.dirname(prefix + '.ext')
         outname_bids = prefix + '.json'
@@ -246,7 +246,7 @@ def convert(items, converter, scaninfo_suffix, custom_callable, with_prov,
                  prefix, len(item_dicoms), prefix_dirname, converter, outtypes)
         # We want to create this dir only if we are converting it to nifti,
         # or if we're using BIDS
-        dicom_only = len(outtypes) == 1 and outtypes[0] == 'dicom'
+        dicom_only = outtypes == ('dicom',)
         if not(dicom_only and bids) and not op.exists(prefix_dirname):
             os.makedirs(prefix_dirname)
 

tests/test_heuristics.py

@@ -127,12 +127,12 @@ def test_ls(stdout):
 
 
 def test_scout_conversion(tmpdir):
+    tmppath = tmpdir.strpath
     args = (
-        "-b -f reproin --files %s -o %s"
-        % (TESTS_DATA_PATH, tmpdir)
-    ).split(' ')
+        "-b -f reproin --files %s"
+        % (TESTS_DATA_PATH)
+    ).split(' ') + ['-o', tmppath]
     runner(args)
-    tmppath = tmpdir.strpath
 
     assert not op.exists(pjoin(
         tmppath,

tests/test_monitor.py

@@ -21,8 +21,11 @@
     my_events = [(header, type_names, watch_path, filename),
                  (header, type_names, path2, b'')]
 except AttributeError:
+    # Import of inotify fails on mac os x with error
+    # lsym(0x11fbeb780, inotify_init): symbol not found
+    # because inotify doesn't seem to exist on Mac OS X
     my_events = []
-    pytestmark = pytest.mark.skip(reason='TODO')
+    pytestmark = pytest.mark.skip(reason='Unable to import inotify')
 
 
 class MockInotifyTree(object):